diff --git a/app/partials/change-password-from-recovery.jade b/app/partials/change-password-from-recovery.jade
index ca511219..26fb10a4 100644
--- a/app/partials/change-password-from-recovery.jade
+++ b/app/partials/change-password-from-recovery.jade
@@ -1,4 +1,4 @@
-extends layout
+extends dummy-layout
 
 block head
     title Taiga  Project management web application with scrum in mind!
diff --git a/app/partials/views/modules/change-password-from-recovery-form.jade b/app/partials/views/modules/change-password-from-recovery-form.jade
index 7d6f50c8..55948580 100644
--- a/app/partials/views/modules/change-password-from-recovery-form.jade
+++ b/app/partials/views/modules/change-password-from-recovery-form.jade
@@ -1,12 +1,15 @@
-div.change-password-form-container(tg-forgot-Password)
+div.change-password-form-container(tg-change-password-from-recovery)
     p.change-password-text
         strong Create a new Taiga pass <br />
         span And hey, you may want to eat some more iron-rich food, it's good for your brain :P
 
     form(ng-submit="ctrl.submit()")
         fieldset
-            input(type="password", name="password", placeholder="new password")
+            input(type="password", name="password", ng-model="data.password", data-required="true",
+                  placeholder="New password")
         fieldset
-            input(type="password", name="repassword", placeholder="re-type new password")
+            input(type="password", name="repassword", ng-model="data.password2", data-required="true",
+                  placeholder="Re-type new password")
         fieldset
-            a.button.button.button-green(href="", title="Reset Password") Reset Password
+            a.button.button.button-gray(href="", title="Reset Password") Reset Password
+            input(type="submit", style="display:none")