diff --git a/include/class.client.php b/include/class.client.php
index e9567c68fdd3d0901a617f574fab24b43753592a..2202abeff1ccda8e013e3c64d516b69a84bd7252 100644
--- a/include/class.client.php
+++ b/include/class.client.php
@@ -26,11 +26,14 @@ abstract class TicketUser {
     function __call($name, $args) {
         global $cfg;
 
+        $rv = null;
         if($this->user && is_callable(array($this->user, $name)))
-            return  $args
+            $rv = $args
                 ? call_user_func_array(array($this->user, $name), $args)
                 : call_user_func(array($this->user, $name));
 
+        if ($rv) return $rv;
+
         $tag =  substr($name, 3);
         switch (strtolower($tag)) {
             case 'ticket_link':