diff --git a/phpbbforum.module b/phpbbforum.module
index b825412..e95a464 100644
--- a/phpbbforum.module
+++ b/phpbbforum.module
@@ -557,8 +557,8 @@ function phpbbforum_user_update(&$edit, $account, $category) {
     $name = $edit['name'];
     $mail = $edit['mail'];

-    $updatename = ($account->name != $edit['name']) ? $name : '';
-    $updatemail = ($account->mail != $edit['mail']) ? $mail : '';
+    $updatename = isset($edit['phpbb_update_name']) ? $edit['phpbb_update_name'] : '';
+    $updatemail = isset($edit['phpbb_update_mail']) ? $edit['phpbb_update_mail'] : '';

     $phpbb_user_data = $phpbb_user->data;

@@ -875,6 +875,10 @@ function phpbbforum_user_presave(&$edit, $account, $category) {
     if (!isset($edit['phpbbpass'])) {
       $edit['phpbbpass'] = $account->pass;
     }
+
+   $edit['phpbb_update_name'] = ($account->name != $edit['name']) ? $edit['name'] : '';
+   $edit['phpbb_update_mail'] = ($account->mail != $edit['mail']) ? $edit['mail'] : '';
+
     //return _phpbbforum_user_edit_validate($account, $edit);
   }
 }