diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 76d3f433e4b..89aad5202fe 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -12,7 +12,7 @@
       Change your password
       - unless @user.password_automatically_set?
         or recover your current one
-    = form_for @user, url: profile_password_path, method: :put do |f|
+    = form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
       -if @user.errors.any?
         .alert.alert-danger
           %ul
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index a60db1cb534..0c60328583a 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -64,7 +64,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
     page.within '.update-password' do
       fill_in "user_password", with: "22233344"
       fill_in "user_password_confirmation", with: "22233344"
-      click_button "Save"
+      click_button "Save password"
     end
   end
 
@@ -73,7 +73,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
       fill_in "user_current_password", with: "12345678"
       fill_in "user_password", with: "22233344"
       fill_in "user_password_confirmation", with: "22233344"
-      click_button "Save"
+      click_button "Save password"
     end
   end
 
@@ -82,7 +82,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
       fill_in "user_current_password", with: "12345678"
       fill_in "user_password", with: "password"
       fill_in "user_password_confirmation", with: "confirmation"
-      click_button "Save"
+      click_button "Save password"
     end
   end