diff --git a/masquerade.module b/masquerade.module
index ca26743..daa4cab 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -606,13 +606,10 @@ function masquerade_block_1() {
         $account = user_load($switch_user);
         if (isset($account->uid)) {
           $switch_link = 'masquerade/switch/' . $account->uid;
-          if ($account->uid) {
-            $quick_switch_links[] = l($account->name, $switch_link, array('query' => array('token' => drupal_get_token($switch_link))));
-          }
           if ($switch_user == 0) {
             $account->name = variable_get('anonymous', t('Anonymous'));
-            $quick_switch_links[] = l($account->name, $switch_link, array('query' => array('token' => drupal_get_token($switch_link))));
           }
+          $quick_switch_links[] = l($account->name, $switch_link, array('query' => array('token' => drupal_get_token($switch_link)), 'attributes' => array('title' => t('roles:') . ' ' . implode(', ', $account->roles))));
         }
       }
     }