diff --git a/modules/user.module b/modules/user.module
index f4eccbd23ec0cd75f0d6a76f07ebdafbf166d529..6428e5f5940c88c5cee8bdcfed73403ea2d55b68 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1044,7 +1044,7 @@ function user_edit_validate($uid, &$edit) {
     form_set_error('mail', $error);
   }
   else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
-    form_set_name('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
+    form_set_error('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
   }
   else if (user_deny('mail', $edit['mail'])) {
     form_set_error('mail', t('The e-mail address "%s" has been denied access.', array('%s' => $edit['mail'])));
diff --git a/modules/user/user.module b/modules/user/user.module
index f4eccbd23ec0cd75f0d6a76f07ebdafbf166d529..6428e5f5940c88c5cee8bdcfed73403ea2d55b68 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1044,7 +1044,7 @@ function user_edit_validate($uid, &$edit) {
     form_set_error('mail', $error);
   }
   else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
-    form_set_name('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
+    form_set_error('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
   }
   else if (user_deny('mail', $edit['mail'])) {
     form_set_error('mail', t('The e-mail address "%s" has been denied access.', array('%s' => $edit['mail'])));