diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index e9427856..c93bcf55 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -43,6 +43,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide,
     $routeProvider.when("/register", {templateUrl: "/partials/register.html"})
     $routeProvider.when("/forgot-password", {templateUrl: "/partials/forgot-password.html"})
     $routeProvider.when("/change-password/:token", {templateUrl: "/partials/change-password-from-recovery.html"})
+    $routeProvider.when("/invitation/:token", {templateUrl: "/partials/invitation.html"})
 
     $routeProvider.otherwise({redirectTo: '/login'})
     $locationProvider.html5Mode(true)
diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index 1344563f..1a28ae6f 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -164,6 +164,8 @@ urls = {
     "forgot-password": "/forgot-password",
     "change-password": "/change-password/:token",
     "register": "/register",
+    "invitation": "/invitation/:token",
+
     "profile": "/:user",
     "project": "/project/:project",
     "project-backlog": "/project/:project/backlog",
diff --git a/app/partials/invitation.jade b/app/partials/invitation.jade
index c17848e4..c00ff149 100644
--- a/app/partials/invitation.jade
+++ b/app/partials/invitation.jade
@@ -1,4 +1,4 @@
-extends login-layout
+extends dummy-layout
 
 block head
     title Taiga  Project management web application with scrum in mind!
@@ -7,36 +7,16 @@ block content
     div.wrapper
         div.invitation-main
             div.invitation-container
-                //h1.logo
-                    //img(src="/images/logo.png", alt="TAIGA")
+                h1.logo
+                    img(src="/images/logo.png", alt="TAIGA")
                 figure.avatar
                     a(href="", title="UserName")
                         img.avatar(src="http://thecodeplayer.com/u/uifaces/12.jpg", alt="username")
                         figcaption Username
-                p.invitation-text has sent you an invitation to join  the taiga project
+                p.invitation-text has sent you an invitation to join to the taiga project
                     span.project-name taiga
+
                 div.invitation-form
+                    include views/modules/invitation-login-form
+                    include views/modules/invitation-register-form
 
-                    form.login-form
-                        fieldset
-                            input(type="text", name="username", placeholder="User name")
-                        fieldset.login-password
-                            input(type="password", name="password", ng-model="form.password")
-                            a.forgot-pass(href="", title="Did you forgot your pass?") Forgot it?
-                        fieldset
-                            a.button.button-login.button-gray(href="", title="Log in") Enter
-
-                    form.register-form
-                        fieldset
-                            input(type="text" placeholder="Pick a username")
-                        fieldset
-                            input(type="text" placeholder="Your email")
-                        fieldset
-                            input(type="password"  placeholder="Set a password")
-                        fieldset
-                            a.button.button-register.button-gray(href="", title="Sign up") Sign up
-                        p.register-text
-                            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/partials/views/modules/invitation-login-form.jade b/app/partials/views/modules/invitation-login-form.jade
new file mode 100644
index 00000000..169ef40b
--- /dev/null
+++ b/app/partials/views/modules/invitation-login-form.jade
@@ -0,0 +1,8 @@
+form.login-form
+    fieldset
+        input(type="text", name="username", data-required="true", placeholder="Username or email")
+    fieldset.login-password
+        input(type="password", name="password", data-required="true", placeholder="Password" )
+        a.forgot-pass(href="", tg-nav="forgot-password", title="Did you forgot your password?") Forgot it?
+    fieldset
+        a.button.button-login.button-gray(href="", title="Log in") Enter
diff --git a/app/partials/views/modules/invitation-register-form.jade b/app/partials/views/modules/invitation-register-form.jade
new file mode 100644
index 00000000..21a610be
--- /dev/null
+++ b/app/partials/views/modules/invitation-register-form.jade
@@ -0,0 +1,17 @@
+form.register-form
+    fieldset
+        input(type="text" placeholder="Pick a username", data-required="true")
+    fieldset
+        input(type="text" placeholder="Your email", data-required="true")
+    fieldset
+        input(type="password"  placeholder="Set a password", data-required="true")
+    fieldset
+        a.button.button-register.button-gray(href="", title="Sign up") Sign up
+
+    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.
+