diff --git a/user/managetoken.php b/user/managetoken.php
index 58ac0fa2104..1c62bd901f9 100644
--- a/user/managetoken.php
+++ b/user/managetoken.php
@@ -67,9 +67,11 @@ if ( !is_siteadmin($USER->id)
         $webservice->generate_user_ws_tokens($USER->id); //generate all token that need to be generated
         $tokens = $webservice->get_user_ws_tokens($USER->id);
         foreach ($tokens as $token) {
-            $authlist = $webservice->get_ws_authorised_user($token->wsid, $USER->id);
-            if(empty($authlist) && $token->restrictedusers) {
-                $token->enabled = false;
+            if ($token->restrictedusers) {
+                $authlist = $webservice->get_ws_authorised_user($token->wsid, $USER->id);
+                if (empty($authlist)) {
+                    $token->enabled = false;
+                }
             }
         }
         $webservicetokenboxhtml =  $wsrenderer->user_webservice_tokens_box($tokens, $USER->id,
diff --git a/webservice/renderer.php b/webservice/renderer.php
index d3579934ceb..37b993561ff 100644
--- a/webservice/renderer.php
+++ b/webservice/renderer.php
@@ -320,10 +320,11 @@ class core_webservice_renderer extends plugin_renderer_base {
                     $validuntil = date("F j, Y"); //TODO: language support (look for moodle function)
                 }
 
+                $tokenname = $token->name;
                 if (!$token->enabled) { //that is the (1 token-1ws) related ws is not enabled.
-                    $token->name = '<span class="dimmed_text">'.$token->name.'</span>';
+                    $tokenname = '<span class="dimmed_text">'.$token->name.'</span>';
                 }
-                $row = array($token->token, $token->name, $validuntil, $creatoratag, $reset);
+                $row = array($token->token, $tokenname, $validuntil, $creatoratag, $reset);
 
                 if ($documentation) {
                     $doclink = new moodle_url('/webservice/wsdoc.php',