diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index bfb45151b..5d8a89491 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -25,22 +25,22 @@
       Show email publicly on your profile page
 
   %h2 Change password
-
-  .control-group
-    = f.label :password, :class => 'control-label'
-    .controls
-      = f.password_field :password, :autocomplete => "off"
-      %span.help-inline Leave blank if you don't want to change your password
-
-  .control-group
-    = f.label :password_confirmation, :class => 'control-label'
-    .controls= f.password_field :password_confirmation
+  %span.help-inline Leave blank if you don't want to change your password
 
   .control-group
     = f.label :current_password, :class => 'control-label'
     .controls
       = f.password_field :current_password
 
+  .control-group
+    = f.label :password, "New password", :class => 'control-label'
+    .controls
+      = f.password_field :password, :autocomplete => "off"
+
+  .control-group
+    = f.label :password_confirmation, :class => 'control-label'
+    .controls= f.password_field :password_confirmation
+
   .form-actions
     = f.submit "Update", :class => 'btn'