diff --git a/web-services/repositories/ticketRepository.php b/web-services/repositories/ticketRepository.php
index 93c2566d..ddffd6ac 100644
--- a/web-services/repositories/ticketRepository.php
+++ b/web-services/repositories/ticketRepository.php
@@ -24,7 +24,52 @@ class TicketRepository {
             return ('An error occured when establishing a connection to the database.');
         }
 
-        $sql = 'SELECT * FROM '.$settings['db_pfix'].'tickets WHERE id = '.$id;
+        $sql = 'SELECT T.id, '.
+            'T.trackid, '.
+            'T.name AS "ContactName", '.
+            'T.email, '.
+            'C.name AS "CategoryName", '.
+            'T.priority, '.
+            'T.subject, '.
+            'T.message, '.
+            'T.dt, '.
+            'T.lastchange, '.
+            'T.ip, '.
+            'T.language, '.
+            'T.status, '.
+            'U.name AS "Owner", '.
+            'T.time_worked, '.
+            'T.lastreplier, '.
+            'U2.name AS "LastReplierName", '.
+            'T.archive, '.
+            'T.locked, '.
+            'T.attachments, '.
+            'T.merged, '.
+            'T.custom1, '.
+            'T.custom2, '.
+            'T.custom3, '.
+            'T.custom4, '.
+            'T.custom5, '.
+            'T.custom6, '.
+            'T.custom7, '.
+            'T.custom8, '.
+            'T.custom9, '.
+            'T.custom10, '.
+            'T.custom11, '.
+            'T.custom12, '.
+            'T.custom13, '.
+            'T.custom14, '.
+            'T.custom15, '.
+            'T.custom16, '.
+            'T.custom17, '.
+            'T.custom18, '.
+            'T.custom19, '.
+            'T.custom20 '.
+            'FROM '.$settings['db_pfix'].'tickets T '.
+            'INNER JOIN '.$settings['db_pfix'].'categories C ON C.id = T.category '.
+            'LEFT JOIN '.$settings['db_pfix'].'users U ON U.id = T.owner '.
+            'LEFT JOIN '.$settings['db_pfix'].'users U2 ON U2.id = T.replierid '.
+            'WHERE T.id = '.$id;
         $results = $connection->query($sql);
 
         //-- There will only ever be one result, as ID is the primary key on the tickets table.
@@ -34,21 +79,21 @@ class TicketRepository {
 
         $ticket->id = $result['id'];
         $ticket->trackingId = $result['trackid'];
-        $ticket->name = $result['name'];
+        $ticket->name = $result['ContactName'];
         $ticket->email = $result['email'];
-        $ticket->category = $result['category'];
-        $ticket->priority = $result['priority'];
+        $ticket->category = $result['CategoryName'];
+        $ticket->priority = self::getPriorityForId($result['priority']);
         $ticket->subject = $result['subject'];
         $ticket->message = $result['message'];
         $ticket->dateCreated = $result['dt'];
         $ticket->dateModified = $result['lastchange'];
         $ticket->ip = $result['ip'];
         $ticket->language = $result['language'];
-        $ticket->status = $result['status'];
-        $ticket->owner = $result['owner'];
+        $ticket->status = self::getStatusForId($result['status']);
+        $ticket->owner = $result['Owner'];
         $ticket->timeWorked = $result['time_worked'];
-        $ticket->lastReplier = $result['lastreplier'];
-        $ticket->replierId = $result['replierid'];
+        $ticket->lastReplier = self::getWhoLastRepliedForId($result['lastreplier']);
+        $ticket->replierId = $result['LastReplierName'];
         $ticket->isArchived = $result['archive'];
         $ticket->isLocked = $result['locked'];
         $ticket->attachments = $result['attachments'];
@@ -79,6 +124,38 @@ class TicketRepository {
 
         return $ticket;
     }
+    
+    public function getPriorityForId($id) {
+        if ($id == 0){
+            return '* Critical *';
+        } elseif ($id == 1){
+            return 'High';
+        } elseif ($id == 2){
+            return 'Medium';
+        } elseif ($id == 3){
+            return 'Low';
+        }
+    }
+    
+    private function getStatusForId($id) {
+        if ($id == 0) {
+            return 'New';
+        } elseif ($id == 1) {
+            return 'Waiting Reply';
+        } elseif ($id == 2) {
+            return 'Replied';
+        } elseif ($id == 3) {
+            return 'Resolved';
+        } elseif ($id == 4) {
+            return 'In Progress';
+        } elseif ($id == 5) {
+            return 'On Hold';
+        }
+    }
+    
+    private function getWhoLastRepliedForId($id) {
+        return ($id == 0 ? 'Contact' : 'Staff');
+    }
 }
 
 ?>