diff --git a/include/ajax.content.php b/include/ajax.content.php
index 7f2bf7d7765cfe1b5fdaceba78166bf186d2f038..225fb5fab3c035acea639a7bfdacddbffb21f1a2 100644
--- a/include/ajax.content.php
+++ b/include/ajax.content.php
@@ -39,42 +39,44 @@ class ContentAjaxAPI extends AjaxController {
         $content='
 <div style="width:680px;">
     <h2>Ticket Variables</h2>
-    Please note that non-base variables depends on the context of use.
+    Please note that non-base variables depends on the context of use. Visit osTicket Wiki for up to date documentation.
     <br/>
     <table width="100%" border="0" cellspacing=1 cellpadding=2>
         <tr><td width="50%" valign="top"><b>Base Variables</b></td><td><b>Other Variables</b></td></tr>
         <tr>
             <td width="50%" valign="top">
                 <table width="100%" border="0" cellspacing=1 cellpadding=1>
-                    <tr><td width="100">%id</td><td>Ticket ID (internal ID)</td></tr>
-                    <tr><td>%ticket</td><td>Ticket number (external ID)</td></tr>
-                    <tr><td>%email</td><td>Email address</td></tr>
-                    <tr><td>%name</td><td>Full name</td></tr>
-                    <tr><td>%subject</td><td>Subject</td></tr>
-                    <tr><td>%topic</td><td>Help topic (web only)</td></tr>
-                    <tr><td>%phone</td><td>Phone number | ext</td></tr>
-                    <tr><td>%status</td><td>Status</td></tr>
-                    <tr><td>%priority</td><td>Priority</td></tr>
-                    <tr><td>%dept</td><td>Department</td></tr>
-                    <tr><td>%staff</td><td>Assigned/closing staff</td></tr>
-                    <tr><td>%team</td><td>Assigned/closing team</td></tr>
-                    <tr><td>%assigned</td><td>Assigned staff and/or team</td></tr>
-                    <tr><td>%createdate</td><td>Date created</td></tr>
-                    <tr><td>%duedate</td><td>Due date</td></tr>
-                    <tr><td>%closedate</td><td>Date closed</td></tr>
+                    <tr><td width="100">%{ticket.id}</td><td>Ticket ID (internal ID)</td></tr>
+                    <tr><td>%{ticket.number}</td><td>Ticket number (external ID)</td></tr>
+                    <tr><td>%{ticket.email}</td><td>Email address</td></tr>
+                    <tr><td>%{ticket.name}</td><td>Full name</td></tr>
+                    <tr><td>%{ticket.subject}</td><td>Subject</td></tr>
+                    <tr><td>%{ticket.phone}</td><td>Phone number | ext</td></tr>
+                    <tr><td>%{ticket.status}</td><td>Status</td></tr>
+                    <tr><td>%{ticket.priority}</td><td>Priority</td></tr>
+                    <tr><td>%{ticket.assigned}</td><td>Assigned staff and/or team</td></tr>
+                    <tr><td>%{ticket.create_date}</td><td>Date created</td></tr>
+                    <tr><td>%{ticket.due_date}</td><td>Due date</td></tr>
+                    <tr><td>%{ticket.close_date}</td><td>Date closed</td></tr>
+                    <tr><td>%{ticket.auth_token}</td><td>Auth. token used for auto-login</td></tr>
+                    <tr><td>%{ticket.client_link}</td><td>Client\'s ticket view link</td></tr>
+                    <tr><td>%{ticket.staff_link}</td><td>Staff\'s ticket view link</td></tr>
+                    <tr><td colspan="2"><em>Expandable Variables (See Wiki)</em></td></tr>
+                    <tr><td>%{ticket.<b>topic</b>}</td><td>Help topic</td></tr>
+                    <tr><td>%{ticket.<b>dept</b>}</td><td>Department</td></tr>
+                    <tr><td>%{ticket.<b>staff</b>}</td><td>Assigned/closing staff</td></tr>
+                    <tr><td>%{ticket.<b>team</b>}</td><td>Assigned/closing team</td></tr>
                 </table>
             </td>
             <td valign="top">
                 <table width="100%" border="0" cellspacing=1 cellpadding=1>
                     <tr><td width="100">%message</td><td>Message (incoming)</td></tr>
-                    <tr><td>%response</td><td>Response (outgoing)</td></tr>
-                    <tr><td>%note</td><td>Internal/transfer note</td></tr>
-                    <tr><td>%staff.name</td><td>Staff\'s name (alert/notices)</td></tr>
-                    <tr><td>%assignee</td><td>Assigned staff (assignment)</td></tr>
-                    <tr><td>%assigner</td><td>Staff assigning the ticket</td></tr>
-                    <tr><td>%url</td><td>osTicket\'s base url (FQDN)</td></tr>
-                    <tr><td>%auth</td><td>Client authentication token</td></tr>
-                    <tr><td>%clientlink</td><td>Client auto-login link</td></tr>
+                    <tr><td>%{response}</td><td>Response (outgoing)</td></tr>
+                    <tr><td>%{title}</td><td>Internal/transfer note title</td></tr>
+                    <tr><td>%{note}</td><td>Internal/transfer note message</td></tr>
+                    <tr><td>%{assignee}</td><td>Assigned staff (assignment)</td></tr>
+                    <tr><td>%{assigner}</td><td>Staff assigning the ticket</td></tr>
+                    <tr><td>%{url}</td><td>osTicket\'s base url (FQDN)</td></tr>
                 </table>
             </td>
         </tr>
diff --git a/include/class.ticket.php b/include/class.ticket.php
index ec3ec6a15f749778a3ab34ca9f15d06b9743bd7f..641c50f5ad1fae1007186df46d748b8fb03188b6 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1113,17 +1113,13 @@ class Ticket {
             case 'phone_number':
                 return $this->getPhoneNumber();
                 break;
-            case 'auth_code':
             case 'auth_token':
                 return $this->getAuthToken();
                 break;
-                
-            case 'clientlink':
             case 'client_link':
                 return sprintf('%s/view.php?t=%s&e=%s&a=%s',
                         $cfg->getBaseUrl(), $this->getNumber(), $this->getEmail(), $this->getAuthToken());
                 break;
-            case 'stafflink':
             case 'staff_link':
                 return sprintf('%s/scp/tickets.php?id=%d', $cfg->getBaseUrl(), $this->getId());
                 break;