diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 5adb4f24a..e690fc722 100755
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -98,7 +98,8 @@ class ServersController extends AppController {
 		$customPagination = new CustomPaginationTool();
 		$params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias);
 		$this->params->params['paging'] = array($this->modelClass => $params);
-		$customPagination->truncateByPagination($events, $params);
+		if (is_array($events)) $customPagination->truncateByPagination($events, $params);
+		else ($events = array());
 		$this->set('events', $events);
 		$this->set('eventDescriptions', $this->Event->fieldDescriptions);
 		$this->set('analysisLevels', $this->Event->analysisLevels);
diff --git a/app/View/Users/admin_view.ctp b/app/View/Users/admin_view.ctp
index e21aeeee9..3cfa1901e 100755
--- a/app/View/Users/admin_view.ctp
+++ b/app/View/Users/admin_view.ctp
@@ -13,7 +13,7 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
 		</dd>
 		<dt><?php echo __('Org'); ?></dt>
 		<dd>
-			<?php echo h($user['Organisation']['name']); ?>
+			<a href="<?php echo $baseurl?>/organisations/view/<?php echo h($user['Organisation']['id']); ?>"><?php echo h($user['Organisation']['name']); ?></a>
 			&nbsp;
 		</dd>
 		<dt><?php echo __('Role'); ?></dt>