diff --git a/source/webui/pages/home.php b/source/webui/pages/home.php
index bfce82f..2a2616d 100644
--- a/source/webui/pages/home.php
+++ b/source/webui/pages/home.php
@@ -1,10 +1,16 @@
 <?php
 
-$config = StatusBoard_Main::instance()->config();
+$main = StatusBoard_Main::instance();
+$config = $main->config();
+$auth = $main->auth();
+
 
 $services = StatusBoard_Service::all();
 $this->smarty->assign('services', $services);
 
 $this->smarty->assign('site_title', $config->get('site.title', 'Status Board'));
 
+$display_admin_links = ($auth->isAuthenticated() && $auth->isAdministrator());
+$this->smarty->assign('display_admin_links', $display_admin_links);
+
 ?>
\ No newline at end of file
diff --git a/source/webui/pages/status.php b/source/webui/pages/status.php
index e1a6426..ba44d78 100644
--- a/source/webui/pages/status.php
+++ b/source/webui/pages/status.php
@@ -1,6 +1,7 @@
 <?php
 $main = StatusBoard_Main::instance();
 $request = $main->request();
+$auth = $main->auth();
 
 $service_id = $request->get('service', 'Sihnon_Exception_InvalidParameters');
 $site_id = $request->get('id', 'Sihnon_Exception_InvalidParameters');
@@ -25,4 +26,7 @@ $this->smarty->assign('site', $site);
 $this->smarty->assign('start', $start);
 $this->smarty->assign('end', $end);
 
+$display_admin_links = ($auth->isAuthenticated() && $auth->isAdministrator());
+$this->smarty->assign('display_admin_links', $display_admin_links);
+
 ?>
\ No newline at end of file
diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl
index c14390e..c4014a3 100644
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -25,14 +25,22 @@
             {foreach from=$services item=service}
                 <tr>
                     <th colspan="9" class="service">
-                        {$service->name}
+                        {if $display_admin_links}
+                            <a href="{$base_uri}admin/service/id/{$service->id}/" title="Edit {$service->name}">{$service->name}</a>
+                        {else}
+                            {$service->name}
+                        {/if}
                     </th>
                 </tr>
                 {foreach from=$service->sites() item=site}
                 {$incidents=$site->openIncidents()}
                     <tr class="site">
                         <td>
-                            {$site->name}
+                            {if $display_admin_links}
+                                <a href="{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/" title="Edit {$site->name|escape:html}">{$site->name|escape:html}</a>
+                            {else}
+                                {$site->name}
+                            {/if}
                         </td>
                         <td>
                             {$status=$site->status()}
diff --git a/source/webui/templates/status.tpl b/source/webui/templates/status.tpl
index 1e868f8..5291e58 100644
--- a/source/webui/templates/status.tpl
+++ b/source/webui/templates/status.tpl
@@ -12,7 +12,13 @@
                     {$statuses=$incident->statusChanges()}
                     <div class="row">
                         <div class="span4 column">
-                            <h3 class="status">{$incident->reference|escape:html}</h3>
+                            <h3 class="status">
+                                {if $display_admin_links && $incident->currentStatus() != StatusBoard_Status::STATUS_Resolved}
+                                    <a href="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/" title="Edit {$incident->reference|escape:html}">{$incident->reference|escape:html}</a>
+                                {else}
+                                    {$incident->reference|escape:html}
+                                {/if}
+                            </h3>
                             <p>Opened: {$incident->start_time|date:"r"}<p>
                             {if $incident->estimated_end_time}
                                 {$time_difference=time()-$incident->estimated_end_time}
@@ -65,7 +71,13 @@
     								<tbody>
     								{foreach from=$incidentsDuring item=incident}
     									<tr>
-    			                			<td>{$incident->reference|escape:html}</td>
+    			                			<td>
+                                                {if $display_admin_links && $incident->currentStatus() != StatusBoard_Status::STATUS_Resolved}
+                                                    <a href="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/" title="Edit {$incident->reference|escape:html}">{$incident->reference|escape:html}</a>
+                                                {else}
+                                                    {$incident->reference|escape:html}
+                                                {/if}
+    			                			</td>
     			                			<td>{$incident->description|truncate|escape:html}</td>
     			                			<td>{date('d-M H:i', $incident->start_time)}</td>
     			                			<td>{StatusBoard_Status::name($incident->currentStatus())}</td>