diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index e0005c35bf..7730545ed9 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -947,7 +947,7 @@ class AssetsController extends AdminController
 	    ->addColumn('status',function($assets)
 	        {	
 		        	if ($assets->assigned_to!='') {
-			        	return link_to('../users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
+			        	return link_to('../admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
 			        } else {
 				        return $assets->assetstatus->name;				        
 			        }
@@ -955,9 +955,9 @@ class AssetsController extends AdminController
 	        })
 		->addColumn('location',function($assets)
             {
-                if ($assets->assigned_to && $assets->assetloc) {
+                if ($assets->assigned_to && $assets->assetloc) {	                
                     return link_to('admin/location/'.$assets->assetloc->id.'/edit', $assets->assetloc->name);
-                } elseif ($assets->defaultLoc!=''){
+                } elseif ($assets->defaultLoc){
                     return link_to('admin/location/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
                 }
             })
diff --git a/app/database/seeds/AssetsSeeder.php b/app/database/seeds/AssetsSeeder.php
index 655a03c363..6ce0bcbd36 100755
--- a/app/database/seeds/AssetsSeeder.php
+++ b/app/database/seeds/AssetsSeeder.php
@@ -244,8 +244,8 @@ class AssetsSeeder extends Seeder
 
 
         $asset[] = array(
-            'name'      	=> 'Drunken Shanenigans Laptop',
-            'asset_tag'     => 'NNY6564567775',
+            'name'      	=> 'Borked Laptop',
+            'asset_tag'     => 'NNY656456778975',
             'model_id'      => 2,
             'serial'      	=> 'WS99689080890',
             'purchase_date' => '2012-01-02',
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 261e5eaa39..8038d73def 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -17,8 +17,7 @@ class Asset extends Depreciable
         'checkout_date' 	=> 'date|max:10|min:10',
         'checkin_date' 		=> 'date|max:10|min:10',
         'supplier_id' 		=> 'integer',
-        'asset_tag'   => 'required|alpha_space|min:3|max:255|unique:assets,asset_tag,{id}',
-        //'serial'   			=> 'required|alpha_dash|min:3|max:255|unique:assets,serial,{id}',
+        'asset_tag'   		=> 'required|alpha_space|min:3|max:255|unique:assets,asset_tag,{id}',
         'status' 			=> 'integer'
         );