diff --git a/application/models/server.php b/application/models/server.php
index 3f62a2e..1f42bed 100644
--- a/application/models/server.php
+++ b/application/models/server.php
@@ -97,7 +97,12 @@ class Server extends CI_Model {
 	 * @param string $serverId
 	 */
 	public function getById($serverId) {
-		return $this->db->get_where('servers', array('id' => $serverId))->row();
+		$this->load->helper('date');
+		$server = $this->db->get_where('servers', array('id' => $serverId))->row();
+		$server->uptimestring = secondsToString($server->uptime);
+		$server->lastheartbeat = sprintf(_('%s ago'), 
+				secondsToString(time_diff($server->last_update, mysql_now())));
+		return $server;
 	}
 }