diff --git a/app/partials/login.jade b/app/partials/login.jade
index ef244401..adb83534 100644
--- a/app/partials/login.jade
+++ b/app/partials/login.jade
@@ -18,3 +18,4 @@ block content
 
                 include views/modules/login-form
                 include views/modules/register-form
+                include views/modules/forgot-form
diff --git a/app/partials/views/modules/forgot-form.jade b/app/partials/views/modules/forgot-form.jade
new file mode 100644
index 00000000..e7e706ee
--- /dev/null
+++ b/app/partials/views/modules/forgot-form.jade
@@ -0,0 +1,9 @@
+div.forgot-form-container
+    p.forgot-text
+        strong Don't worry, it happens even in the best families :-) <br />
+        span Give us your mail and we'll sent you instructions to get a new one
+    form
+        fieldset
+            input(type="text", placeholder="Your email")
+        fieldset
+            a.button.button-forgot.button-green(href="", title="Reset Password") Reset Password
diff --git a/app/partials/views/modules/login-form.jade b/app/partials/views/modules/login-form.jade
index d81f4cb2..1a84cd8f 100644
--- a/app/partials/views/modules/login-form.jade
+++ b/app/partials/views/modules/login-form.jade
@@ -2,7 +2,7 @@ div.login-form-container
     form.login-form(ng-submit="ctrl.submit()")
         fieldset
             input(type="text", name="username", ng-model="form.username", placeholder="User name")
-        fieldset
+        fieldset.login-password
             input(type="password", name="password", ng-model="form.password")
             //-This should be hidden when focus on pass
             a.forgot-pass(href="", title="Did you forgot your pass?") Forgot it?
diff --git a/app/partials/views/modules/register-form.jade b/app/partials/views/modules/register-form.jade
index 88c3e004..f06c13df 100644
--- a/app/partials/views/modules/register-form.jade
+++ b/app/partials/views/modules/register-form.jade
@@ -3,7 +3,7 @@ div.register-form-container
         fieldset
             input(type="text" placeholder="Pick a username")
         fieldset
-            input(type="email" placeholder="Your email")
+            input(type="text" placeholder="Your email")
         fieldset
             input(type="password"  placeholder="Set a password")
         fieldset
@@ -12,4 +12,4 @@ div.register-form-container
         span By clicking "Sign up", you agree to our <br />
         a(href="", title="See terms of service")  terms of service
         span  and
-        a(href="", title="See privacy policy")  privacy policy.
\ No newline at end of file
+        a(href="", title="See privacy policy")  privacy policy.
diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss
index 8c5a8e87..d1374bfa 100644
--- a/app/styles/layout/login.scss
+++ b/app/styles/layout/login.scss
@@ -45,8 +45,7 @@
     .register-text {
         @extend %small;
     }
-    .button-login,
-    .button-register {
+    .button {
         color: $white;
         display: block;
         margin-bottom: .5rem;
@@ -54,35 +53,6 @@
     }
 }
 
-.login-form-container {
-    .login-password {
-        position: relative;
-    }
-    input:focus {
-        &+.forgot-pass {
-            opacity: 0;
-            @include transition(opacity .5s linear);
-        }
-    }
-    .forgot-pass {
-        @include transition(all .3s linear);
-        @extend %small;
-        color: $gray-light;
-        opacity: 1;
-        position: absolute;
-        right: 1rem;
-        top: .5rem;
-        &:hover {
-            @include transition(color .3s linear);
-            color: $grayer;
-        }
-    }
-}
-
-.register-form-container {
-    display: none;
-}
-
 .login-error {
     background: $red;
     border-radius: 4px;
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 5e401406..cf5eb15b 100755
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -52,6 +52,9 @@ $prefix-for-spec:      true;
 @import 'modules/comments';
 @import 'modules/comment-activity';
 @import 'modules/activity';
+@import 'modules/login-form';
+@import 'modules/register-form';
+//@import 'modules/forgot-form';
 
 // Responsive
 @import 'responsive/mobile';
diff --git a/app/styles/modules/forgot-form.scss b/app/styles/modules/forgot-form.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/app/styles/modules/login-form.scss b/app/styles/modules/login-form.scss
new file mode 100644
index 00000000..a7dff770
--- /dev/null
+++ b/app/styles/modules/login-form.scss
@@ -0,0 +1,25 @@
+.login-form-container {
+    display: none;
+    .login-password {
+        position: relative;
+    }
+    input:focus {
+        &+.forgot-pass {
+            opacity: 0;
+            @include transition(opacity .5s linear);
+        }
+    }
+    .forgot-pass {
+        @include transition(all .3s linear);
+        @extend %small;
+        color: $gray-light;
+        opacity: 1;
+        position: absolute;
+        right: 1rem;
+        top: .5rem;
+        &:hover {
+            @include transition(color .3s linear);
+            color: $grayer;
+        }
+    }
+}
diff --git a/app/styles/modules/register-form.scss b/app/styles/modules/register-form.scss
new file mode 100644
index 00000000..6d940cf0
--- /dev/null
+++ b/app/styles/modules/register-form.scss
@@ -0,0 +1,3 @@
+.register-form-container {
+    display: none;
+}