diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index cb69e049c..34a93d231 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -16,7 +16,7 @@ en:
       inactive: 'Your account was not activated yet.'
     sessions:
       new:
-        login: 'Login'
+        login: 'Log in'
         username: 'Username'
         password: 'Password'
         sign_in: 'Sign in'
diff --git a/features/change_password.feature b/features/change_password.feature
index a2e6559f8..41ff0b55c 100644
--- a/features/change_password.feature
+++ b/features/change_password.feature
@@ -20,7 +20,7 @@ Feature: Change password
     And I press "Send me reset password instructions"
     Then I should see "You will receive an email with instructions"
     And I follow the "Change my password" link from the last sent email
-    Then I should see "Change your password"
+    Then I should see "Change my password"
     And I fill in "Password" with "supersecret"
     And I fill in "Password confirmation" with "supersecret"
     And I press "Change my password"