Index: masquerade.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/masquerade/masquerade.module,v
retrieving revision 1.15.2.1
diff -u -p -r1.15.2.1 masquerade.module
--- masquerade.module	20 Nov 2006 09:38:41 -0000	1.15.2.1
+++ masquerade.module	24 Apr 2007 17:59:21 -0000
@@ -22,8 +22,8 @@ function masquerade_help($section) {
  */
 function masquerade_menu($may_cache) {
   $items = array();
-  $default_test_user = user_load(array('name' => variable_get('masquerade_test_user', '')));
   if ($may_cache) {
+    $default_test_user = user_load(array('name' => variable_get('masquerade_test_user', '')));
     $items[] = array('path' => 'masquerade/switch', 
       'title' => t('Switch user'),
       'callback' => 'masquerade_switch_user',
@@ -107,7 +107,7 @@ function masquerade_user($op, &$edit, &$
           'value' => l(t('Masquerade as !s', array('!s' => $edit_user->name)), "masquerade/switch/$edit_user->uid", array('destination' => $_GET['q'])),
           'class' => 'masquerade',
         );
-        return array(t('History') => $items);
+        return array(t('Masquerade') => $items);
       }
       break;
   }