diff --git a/app/partials/change-password-from-recovery.jade b/app/partials/change-password-from-recovery.jade
index d567d387..dbc343e9 100644
--- a/app/partials/change-password-from-recovery.jade
+++ b/app/partials/change-password-from-recovery.jade
@@ -1,19 +1,18 @@
-extends dummy-layout
+extends layout
 
 block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
-    // TODO: Xavi
-    //div.wrapper
-    //    div.login-main
-    //        div.login-container
-    //            h1.logo
-    //                img(src="/images/logo.png", alt="TAIGA")
-    //            p.tagline Project management web application with scrum in mind!
-    //            p.login-error
-    //                span.title Ooops! Something went wrong!
-    //                span.text According to our Oompa Loompas, your are not registered yet.
-    //                a.icon.icon-delete(href="", title="Close message")
+    div.wrapper
+        div.login-main
+            div.login-container
+                h1.logo
+                    img(src="/images/logo.png", alt="TAIGA")
+                p.tagline Project management web application with scrum in mind!
+                p.login-error
+                    span.title Ooops! Something went wrong!
+                    span.text According to our Oompa Loompas, your are not registered yet.
+                    a.icon.icon-delete(href="", title="Close message")
 
-    //            include views/modules/change-password-from-recovery-form
+                include views/modules/change-password-from-recovery-form
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 d70410b8..7d6f50c8 100644
--- a/app/partials/views/modules/change-password-from-recovery-form.jade
+++ b/app/partials/views/modules/change-password-from-recovery-form.jade
@@ -1,13 +1,12 @@
-// TODO: Xavi
-//
-//div.forgot-form-container(tg-forgot-Password)
-//    p.forgot-text
-//        strong Don't worry, it happens even in the best families :-) <br />
-//        span Give us your username or email and we'll sent you instructions to get a new one
-//
-//    form(ng-submit="ctrl.submit()")
-//        fieldset
-//            input(type="text", name="username", ng-model="data.username", data-required="true",
-//                  placeholder="Username or email")
-//        fieldset
-//            a.button.button-forgot.button-gray(href="", title="Reset Password") Reset Password
+div.change-password-form-container(tg-forgot-Password)
+    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")
+        fieldset
+            input(type="password", name="repassword", placeholder="re-type new password")
+        fieldset
+            a.button.button.button-green(href="", title="Reset Password") Reset Password
diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss
index d7e775cf..a4ccbf86 100755
--- a/app/styles/dependencies/typography.scss
+++ b/app/styles/dependencies/typography.scss
@@ -75,7 +75,6 @@ p {
 
 em { font-style: italic; }
 strong {
-    color: #333;
     font-weight: bold;
 }
 
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 9346e44e..1c669459 100755
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -67,6 +67,7 @@ $prefix-for-spec:      true;
 @import 'modules/forgot-form';
 @import 'modules/wiki-nav';
 @import 'modules/wiki-summary';
+@import 'modules/change-password-from-recovery';
 
 //Layout
 @import 'layout/base';
diff --git a/app/styles/modules/change-password-from-recovery.scss b/app/styles/modules/change-password-from-recovery.scss
new file mode 100644
index 00000000..d70a5f35
--- /dev/null
+++ b/app/styles/modules/change-password-from-recovery.scss
@@ -0,0 +1,4 @@
+.change-password-text {
+    color: $grayer;
+    text-align: center;
+}
diff --git a/app/styles/modules/forgot-form.scss b/app/styles/modules/forgot-form.scss
index cd3d6dde..9caa3635 100644
--- a/app/styles/modules/forgot-form.scss
+++ b/app/styles/modules/forgot-form.scss
@@ -1 +1 @@
-.forgot-form-container { }
+// Forgot form