diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb
index ef24226f1..1ed0a4a01 100644
--- a/spec/features/account_spec.rb
+++ b/spec/features/account_spec.rb
@@ -138,6 +138,6 @@ feature 'Account' do
 
     login_through_form_as(@user)
 
-    expect(page).to have_content "Invalid email or password"
+    expect(page).to have_content "Invalid login or password"
   end
 end
diff --git a/spec/features/moderation/users_spec.rb b/spec/features/moderation/users_spec.rb
index 053d29590..e34b4383e 100644
--- a/spec/features/moderation/users_spec.rb
+++ b/spec/features/moderation/users_spec.rb
@@ -42,11 +42,11 @@ feature 'Moderate users' do
     visit root_path
 
     click_link 'Sign in'
-    fill_in 'user_email',    with: citizen.email
+    fill_in 'user_login',    with: citizen.email
     fill_in 'user_password', with: citizen.password
     click_button 'Enter'
 
-    expect(page).to have_content 'Invalid email or password'
+    expect(page).to have_content 'Invalid login or password'
     expect(current_path).to eq(new_user_session_path)
   end
 
diff --git a/spec/features/welcome_spec.rb b/spec/features/welcome_spec.rb
index 73cd65f5c..ce06befcc 100644
--- a/spec/features/welcome_spec.rb
+++ b/spec/features/welcome_spec.rb
@@ -18,7 +18,7 @@ feature "Welcome screen" do
 
     visit email_path(email_verification_token: encrypted)
 
-    fill_in 'user_email', with: user.email
+    fill_in 'user_login', with: user.email
     fill_in 'user_password', with: user.password
 
     click_button 'Enter'
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index e0fdfe425..327943931 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -18,7 +18,7 @@ module CommonActions
     visit root_path
     click_link 'Sign in'
 
-    fill_in 'user_email', with: user.email
+    fill_in 'user_login', with: user.email
     fill_in 'user_password', with: user.password
 
     click_button 'Enter'