diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index ddd039e046..4d4e2d8e31 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -691,7 +691,7 @@ class UsersController extends AdminController
 	public function getDatatable($status = null)
     {
 
-	$users = User::with('assets','licenses','manager','sentryThrottle');
+	$users = User::with('assets','licenses','manager','userloc','sentryThrottle');
 
 	switch ($status) {
 		case 'deleted':
@@ -747,6 +747,13 @@ class UsersController extends AdminController
 		       	}
 	        })
 
+            ->addColumn('location',function($users)
+   	        {
+   		        if ($users->userloc) {
+   		       	 return '<a title="'.$users->userloc->name.'" href="users/'.$users->location_id.'/view">'.$users->userloc->name.'</a>';
+   		       	}
+   	        })
+
 		->addColumn('assets',function($users)
 	        {
 		        return $users->assets->count();
@@ -762,8 +769,8 @@ class UsersController extends AdminController
 	        })
 
 	    ->addColumn($actions)
-        ->searchColumns('name','email','manager','activated', 'licenses','assets')
-        ->orderColumns('name','email','manager','activated', 'licenses','assets')
+        ->searchColumns('name','email','manager','activated','licenses','location','assets')
+        ->orderColumns('name','email','manager','activated', 'licenses','location','assets')
         ->make();
 
 		}
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 729d258645..929c3b1554 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -34,12 +34,13 @@
 
 {{ Datatable::table()
     ->addColumn(
-	    Lang::get('admin/users/table.name'), 
-	    Lang::get('admin/users/table.email'), 
+	    Lang::get('admin/users/table.name'),
+	    Lang::get('admin/users/table.email'),
 	    Lang::get('admin/users/table.manager'),
-	    Lang::get('general.assets'), 
-	    Lang::get('general.licenses'), 
-	    Lang::get('admin/users/table.activated'), 
+        Lang::get('general.location'),
+	    Lang::get('general.assets'),
+	    Lang::get('general.licenses'),
+	    Lang::get('admin/users/table.activated'),
 	    Lang::get('table.actions')
     )
     ->setOptions(
@@ -47,7 +48,7 @@
                 'sAjaxSource'=>route('api.users.list', Input::get('status')),
                 'dom' =>'CT<"clear">lfrtip',
                 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','activate'=>'mouseover'),
-                'columnDefs'=> array(array('visible'=>false,'targets'=>array()),array('bSortable'=>false,'targets'=>array(6))),
+                'columnDefs'=> array(array('visible'=>false,'targets'=>array()),array('bSortable'=>false,'targets'=>array(7))),
                 'order'=>array(array(1,'asc')),
             )
         )