diff --git a/include/class.client.php b/include/class.client.php
index 11b500e4aef370bf60846024ada0cf8cf645df55..2d157ede502923d5e88fcbfa90f79924346c30b7 100644
--- a/include/class.client.php
+++ b/include/class.client.php
@@ -59,19 +59,20 @@ implements EmailContact, ITicketUser, TemplateVariable {
         case 'ticket_link':
             $qstr = array();
             if ($cfg && $cfg->isAuthTokenEnabled()
-                    && ($ticket=$this->getTicket())
-                    && !$ticket->getThread()->getNumCollaborators()) {
-                      $qstr['auth'] = $ticket->getAuthToken($this);
-                      return sprintf('%s/view.php?%s',
-                              $cfg->getBaseUrl(),
-                              Http::build_query($qstr, false)
-                              );
-                    }
-                    else {
-                      return sprintf('%s/tickets.php?id=%s',
-                              $cfg->getBaseUrl(),
-                              $ticket->getId()
-                              );
+                    && ($ticket=$this->getTicket())) {
+                      if (!$ticket->getThread()->getNumCollaborators()) {
+                          $qstr['auth'] = $ticket->getAuthToken($this);
+                          return sprintf('%s/view.php?%s',
+                               $cfg->getBaseUrl(),
+                               Http::build_query($qstr, false)
+                               );
+                      }
+                      else {
+                          return sprintf('%s/tickets.php?id=%s',
+                               $cfg->getBaseUrl(),
+                               $ticket->getId()
+                               );
+                      }
                     }