diff --git modules/user/user.pages.inc modules/user/user.pages.inc
index 4c4a029..ae49056 100644
--- modules/user/user.pages.inc
+++ modules/user/user.pages.inc
@@ -297,16 +297,18 @@ function user_profile_form_validate($form, &$form_state) {
  * Submit function for the user account and profile editing form.
  */
 function user_profile_form_submit($form, &$form_state) {
-  $account = $form_state['user'];
+  $account = clone $form_state['user'];
+  $edit = $form_state['user'];
   $category = $form['#user_category'];
+
   // Remove unneeded values.
   form_state_values_clean($form_state);
 
-  entity_form_submit_build_entity('user', $account, $form, $form_state);
+  // Populate $edit with the properties of $form_state
+  entity_form_submit_build_entity('user', $edit, $form, $form_state);
 
-  // Populate $edit with the properties of $account, which have been edited on
-  // this form by taking over all values, which appear in the form values too.
-  $edit = array_intersect_key((array) $account, $form_state['values']);
+  // Cast $edit, since it is used as an array from here on out.
+  $edit = (array) $edit;
 
   user_save($account, $edit, $category);
   $form_state['values']['uid'] = $account->uid;
diff --git modules/user/user.test modules/user/user.test
index 0fa3749..cbde24b 100644
--- modules/user/user.test
+++ modules/user/user.test
@@ -1084,6 +1084,26 @@ class UserAdminTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/people', $edit, t('Update'));
     $account = user_load($user_c->uid, TRUE);
     $this->assertEqual($account->status, 0, 'User C blocked');
+
+    // Test unblocking of a user from /admin/people page and sending of activation mail
+    $editunblock = array();
+    $editunblock['operation'] = 'unblock';
+    $editunblock['accounts[' . $account->uid . ']'] = TRUE;
+    $this->drupalPost('admin/people', $editunblock, t('Update'));
+    $account = user_load($user_c->uid, TRUE);
+    $this->assertEqual($account->status, 1, 'User C unblocked');
+    $this->assertMail("to", $account->mail, "Activation mail sent to user C");
+
+    // Test blocking and unblocking another user from /user/[uid]/edit form and sending of activation mail
+    $user_d = $this->drupalCreateUser(array());
+    $account1 = user_load($user_d->uid, TRUE);
+    $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => 0), t('Save'));
+    $account1 = user_load($user_d->uid, TRUE);
+    $this->assertEqual($account1->status, 0, 'User D blocked');
+    $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => TRUE), t('Save'));
+    $account1 = user_load($user_d->uid, TRUE);
+    $this->assertEqual($account1->status, 1, 'User D unblocked');
+    $this->assertMail("to", $account1->mail, "Activation mail sent to user D");
   }
 }