--- masquerade.module.0	2009-09-10 13:58:21.000000000 -0700
+++ masquerade.module	2009-10-01 15:27:19.000000000 -0700
@@ -285,32 +285,36 @@ function masquerade_user($op, &$edit, &$
 
     case 'form':
       $form = array();
-      $form['masquerade'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Masquerade settings'),
-        '#access' => user_access('administer permissions'),
-      );
-      $result = db_query("SELECT uid_to FROM {masquerade_users} WHERE uid_from = %d", $edit_user->uid);
-      $masquerade_users = array();
-      while ($uid_to = db_result($result)) {
-        $u = user_load($uid_to);
-        $masquerade_users[] = $u->name;
+      if ($category == 'account') {
+        $form['masquerade'] = array(
+          '#type' => 'fieldset',
+          '#title' => t('Masquerade settings'),
+          '#access' => user_access('administer permissions'),
+        );
+        $result = db_query("SELECT uid_to FROM {masquerade_users} WHERE uid_from = %d", $edit_user->uid);
+        $masquerade_users = array();
+        while ($uid_to = db_result($result)) {
+          $u = user_load($uid_to);
+          $masquerade_users[] = $u->name;
+        }
+        $form['masquerade']['masquerade_users'] = array(
+          '#type' => 'textfield',
+          '#title' => t('Enter the users this user is able to masquerade as'),
+          '#description' => t('Enter a comma seperated list of user names that this user can masquerade as.'),
+          '#autocomplete_path' => 'masquerade/autocomplete-user',
+          '#default_value' => implode(", ", $masquerade_users),
+        );
       }
-      $form['masquerade']['masquerade_users'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Enter the users this user is able to masquerade as'),
-        '#description' => t('Enter a comma seperated list of user names that this user can masquerade as.'),
-        '#autocomplete_path' => 'masquerade/autocomplete-user',
-        '#default_value' => implode(", ", $masquerade_users),
-      );
       return $form;
       break;
 
     case 'validate':
-      $users = drupal_explode_tags($edit['masquerade_users']);
-      foreach ($users as $user) {
-        if (!user_load(array('name' => $user))) {
-          form_set_error('masquerade_users', t('%user is not a valid user name.', array('%user' => $user)));
+      if ($category == 'account') {
+        $users = drupal_explode_tags($edit['masquerade_users']);
+        foreach ($users as $user) {
+          if (!user_load(array('name' => $user))) {
+            form_set_error('masquerade_users', t('%user is not a valid user name.', array('%user' => $user)));
+          }
         }
       }
       break;
@@ -320,13 +324,15 @@ function masquerade_user($op, &$edit, &$
       break;
 
     case 'update':
-    	$users = drupal_explode_tags($edit['masquerade_users']);
-      db_query("DELETE FROM {masquerade_users} WHERE uid_from = %d", $edit_user->uid);
-      foreach ($users as $user) {
-        $u = user_load(array('name' => $user));
-        db_query("INSERT INTO {masquerade_users} VALUES (%d, %d)", $edit_user->uid, $u->uid);
+      if ($category == 'account') {
+        $users = drupal_explode_tags($edit['masquerade_users']);
+        db_query("DELETE FROM {masquerade_users} WHERE uid_from = %d", $edit_user->uid);
+        foreach ($users as $user) {
+          $u = user_load(array('name' => $user));
+          db_query("INSERT INTO {masquerade_users} VALUES (%d, %d)", $edit_user->uid, $u->uid);
+        }
+        $edit['masquerade_users'] = NULL;
       }
-      $edit['masquerade_users'] = NULL;
       break;
 
     case 'after_update':