diff --git a/modules/social_features/social_user/social_user.module b/modules/social_features/social_user/social_user.module
index 71db6fee8..6759d69f9 100644
--- a/modules/social_features/social_user/social_user.module
+++ b/modules/social_features/social_user/social_user.module
@@ -37,8 +37,8 @@ function social_user_action_info_alter(&$definitions) {
 function social_user_form_user_login_form_alter(&$form, FormStateInterface $form_state) {
   // Ensure fields have weights so other forms can add items.
   if (isset($form['account'])) {
-    if (isset($form['account']['name_or_email'])) {
-      $form['account']['name_or_email']['#weight'] = -100;
+    if (isset($form['account']['name_or_mail'])) {
+      $form['account']['name_or_mail']['#weight'] = -100;
     }
     if (isset($form['account']['pass'])) {
       $form['account']['pass']['#weight'] = -50;
@@ -70,8 +70,8 @@ function social_user_form_user_register_form_alter(&$form, FormStateInterface $f
     }
 
     // Ensure fields have weights so other forms can add items.
-    if (isset($form['account']['email'])) {
-      $form['account']['email']['#weight'] = -150;
+    if (isset($form['account']['mail'])) {
+      $form['account']['mail']['#weight'] = -150;
     }
     if (isset($form['account']['name'])) {
       $form['account']['name']['#weight'] = -100;