diff --git masquerade.module masquerade.module
index ef73be5..d84c9af 100644
--- masquerade.module
+++ masquerade.module
@@ -380,6 +380,7 @@ function masquerade_form_alter(&$form, $form_state, $form_id) {
       '#title' => t('Masquerade settings'),
       '#access' => user_access('administer masquerade'),
     );
+    $edit_user = $form['#user'];
     $result = db_query("SELECT uid_to FROM {masquerade_users} WHERE uid_from = :uid_from", array('uid_from' => $edit_user->uid));
     $masquerade_users = array();
     while ($uid_to = $result->fetchColumn()) {
@@ -430,7 +431,7 @@ function masquerade_user_update(&$edit, $account, $category) {
   if ($category == 'account') {
     $users = drupal_explode_tags($edit['masquerade_users']);
     $query = db_delete('masquerade_users');
-    $query->condition('uid_from', $edit_user->uid);
+    $query->condition('uid_from', $account->uid);
     $query->execute();
     foreach ($users as $username) {
       $account = _masquerade_user_load($username);