diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index 5386f76e..7ecb4579 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -45,7 +45,7 @@ module.directive("tgMain", ["$rootScope", "$window", TaigaMainDirective])
 
 urls = {
     "home": "/",
-    "logint": "/login",
+    "login": "/login",
     "forgot-password": "/forgot-password",
     "change-password": "/change-password/:token",
     "register": "/register",
diff --git a/app/partials/views/modules/forgot-form.jade b/app/partials/views/modules/forgot-form.jade
index f1d8db28..53b68e02 100644
--- a/app/partials/views/modules/forgot-form.jade
+++ b/app/partials/views/modules/forgot-form.jade
@@ -1,7 +1,7 @@
 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
+    p.forgot-text.
+        <strong>Oh! Did you forget your password?</strong><br />
+        Give us your username or email and we'll sent you instructions to get a new one
 
     form(ng-submit="ctrl.submit()")
         fieldset
@@ -10,3 +10,5 @@ div.forgot-form-container(tg-forgot-Password)
         fieldset
             a.button.button-forgot.button-gray(href="", title="Reset Password") Reset Password
             input(type="submit", style="display:none")
+
+        a(href="", title="Login", tg-nav="login") No, I still keep my password, let's go to login page
diff --git a/app/partials/views/modules/invitation-register-form.jade b/app/partials/views/modules/invitation-register-form.jade
index ddeac08a..dca4648b 100644
--- a/app/partials/views/modules/invitation-register-form.jade
+++ b/app/partials/views/modules/invitation-register-form.jade
@@ -8,7 +8,6 @@ form.register-form
     fieldset
         a.button.button-register.button-gray(href="", title="Sign up") Sign up
         input(type="submit", style="display:none")
-
     p.register-text
         // TODO
         span By clicking "Sign up", you agree to our <br />
diff --git a/app/partials/views/modules/register-form.jade b/app/partials/views/modules/register-form.jade
index bcee9bd6..0dfb9ae3 100644
--- a/app/partials/views/modules/register-form.jade
+++ b/app/partials/views/modules/register-form.jade
@@ -1,4 +1,5 @@
 div.register-form-container(tg-register)
+    a.register-text-top(href="", title="Login", tg-nav="login") Are you already registered?
     form.register-form
         fieldset
             input(type="text", placeholder="Pick a username", ng-model="data.username",
@@ -11,10 +12,9 @@ div.register-form-container(tg-register)
         fieldset
             a.button.button-register.button-gray(href="", title="Sign up") Sign up
             input(type="submit", class="hidden")
-
-    p.register-text
-        // TODO
-        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.
+        p.register-text
+            // TODO
+            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.
diff --git a/app/styles/dependencies/forms.scss b/app/styles/dependencies/forms.scss
index 704fd2a1..1d05f2b1 100644
--- a/app/styles/dependencies/forms.scss
+++ b/app/styles/dependencies/forms.scss
@@ -32,3 +32,11 @@ input[type="password"] {
 textarea {
     max-height: 10rem;
 }
+
+.checksley-error-list {
+    margin-bottom: 0;
+    li {
+        color: $white;
+        padding: .2rem;
+    }
+}
diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss
index 4a295bc6..c22a169b 100644
--- a/app/styles/layout/invitation.scss
+++ b/app/styles/layout/invitation.scss
@@ -74,7 +74,6 @@
         .button {
             color: $white;
             display: block;
-            margin-bottom: .5rem;
             text-align: center;
             &:hover {
                 background: $fresh-taiga;
diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss
index 9b190495..fed7705e 100644
--- a/app/styles/layout/login.scss
+++ b/app/styles/layout/login.scss
@@ -8,6 +8,9 @@
     right: 0;
     top: 0;
     z-index: 999;
+    fieldset {
+        margin-bottom: 1rem;
+    }
     .login-container {
         @include table-flex-child(0, 400px, 0, 400px);
     }
@@ -28,7 +31,6 @@
     }
     input {
         background: $white;
-        margin-bottom: 1rem;
         @include placeholder {
             color: $gray-light;
         }
@@ -40,9 +42,6 @@
             color: $fresh-taiga;
         }
     }
-    .register-text {
-        @extend %small;
-    }
     .button {
         color: $white;
         display: block;
@@ -52,6 +51,11 @@
             background: $fresh-taiga;
         }
     }
+    a {
+        &:hover {
+            color: $white;
+        }
+    }
 }
 
 .login-error {
diff --git a/app/styles/modules/register-form.scss b/app/styles/modules/register-form.scss
index 773c7b44..aac16de9 100644
--- a/app/styles/modules/register-form.scss
+++ b/app/styles/modules/register-form.scss
@@ -1,3 +1,10 @@
 .register-form-container {
     display: block;
+    .register-text-top {
+        display: block;
+        margin-bottom: 1rem;
+    }
+    .register-text {
+        @extend %small;
+    }
 }