diff --git a/app/assets/javascripts/app/controllers/reset_password.js.coffee b/app/assets/javascripts/app/controllers/reset_password.js.coffee
index e65b12ad3..ce5a8f75f 100644
--- a/app/assets/javascripts/app/controllers/reset_password.js.coffee
+++ b/app/assets/javascripts/app/controllers/reset_password.js.coffee
@@ -25,7 +25,7 @@ class Index extends App.ControllerContent
       { name: 'username', display: 'Enter your username or email address', tag: 'input', type: 'text', limit: 100, null: false, class: 'input span4',  },
     ]
 
-    @html App.view('reset_password')(params)
+    @html App.view('password/reset')(params)
 
     @form = new App.ControllerForm(
       el:        @el.find('#form-password-item')
@@ -98,7 +98,7 @@ class Verify extends App.ControllerContent
       { name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 100, null: false, class: 'input span4',  },
     ]
 
-    @html App.view('reset_password_change')()
+    @html App.view('password/reset_change')()
 
     new App.ControllerForm(
       el:        @el.find('#form-password-change')
diff --git a/app/assets/javascripts/app/views/reset_password.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco
similarity index 100%
rename from app/assets/javascripts/app/views/reset_password.jst.eco
rename to app/assets/javascripts/app/views/password/reset.jst.eco
diff --git a/app/assets/javascripts/app/views/reset_password_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco
similarity index 100%
rename from app/assets/javascripts/app/views/reset_password_change.jst.eco
rename to app/assets/javascripts/app/views/password/reset_change.jst.eco