diff --git a/gui/app/pods/auth/forgot/route.js b/gui/app/pods/auth/forgot/route.js
index 1300fac8..6c744df0 100644
--- a/gui/app/pods/auth/forgot/route.js
+++ b/gui/app/pods/auth/forgot/route.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -29,10 +29,10 @@ export default Route.extend({
 	},
 
 	activate() {
-		$('body').addClass('background-color-off-white');
+		$('body').addClass('background-color-theme-light');
 	},
 
 	deactivate() {
-		$('body').removeClass('background-color-off-white');
-	}	
-});
\ No newline at end of file
+		$('body').removeClass('background-color-theme-light');
+	}
+});
diff --git a/gui/app/pods/auth/login/route.js b/gui/app/pods/auth/login/route.js
index 0c2db748..3706084f 100644
--- a/gui/app/pods/auth/login/route.js
+++ b/gui/app/pods/auth/login/route.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -39,7 +39,7 @@ export default Route.extend({
 					});
 
 					break;
-					
+
 				default:
 					this.set('showLogin', true);
 					resolve();
@@ -61,10 +61,10 @@ export default Route.extend({
 	},
 
 	activate() {
-		$('body').addClass('background-color-off-white');
+		$('body').addClass('background-color-theme-light');
 	},
 
 	deactivate() {
-		$('body').removeClass('background-color-off-white');
+		$('body').removeClass('background-color-theme-light');
 	}
-});
\ No newline at end of file
+});
diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs
index 102e14cd..ed771d85 100644
--- a/gui/app/pods/auth/login/template.hbs
+++ b/gui/app/pods/auth/login/template.hbs
@@ -3,25 +3,22 @@
         <div class="logo">
             <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
         </div>
-        <div class="login-form">
-            <form id="login-form" {{action 'login' on="submit"}}>
-                <div class="input-control">
-                    <label>Email</label>
-                    {{focus-input type="email" value=email id="authEmail"}}
-                </div>
-                <div class="input-control">
-                    <label>Password</label>
-                    {{input type="password" value=password id="authPassword"}}
-                </div>
-                <div class="clearfix" />
-                <div class="margin-top-10 margin-bottom-20">
-                    <button type="submit" class="regular-button button-blue">Sign in</button>
-                    <span class="{{unless invalidCredentials "hide"}} color-red margin-left-20">Invalid credentials</span>
-                </div>
-                {{#if isAuthProviderDocumize}}
-                    {{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}}
-                {{/if}}
-            </form>
-        </div>
+		<form {{action 'login' on="submit"}}>
+			<div class="form-group">
+				<label for="authEmail">Email</label>
+				{{focus-input type="email" value=email id="authEmail" class="form-control mousetrap" placeholder=""}}
+			</div>
+			<div class="form-group">
+				<label for="authPassword">Password</label>
+				{{input type="password" value=password id="authPassword" class="form-control"}}
+			</div>
+			<button type="submit" class="btn btn-primary mt-4">Sign in</button>
+			<div class="{{unless invalidCredentials "invisible"}} color-red mt-3">Invalid credentials</div>
+			{{#if isAuthProviderDocumize}}
+				<div class="mt-5">
+					{{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}}
+				</div>
+			{{/if}}
+		</form>
     </div>
 {{/if}}
\ No newline at end of file
diff --git a/gui/app/pods/auth/reset/route.js b/gui/app/pods/auth/reset/route.js
index f719ac33..25426ac3 100644
--- a/gui/app/pods/auth/reset/route.js
+++ b/gui/app/pods/auth/reset/route.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -17,10 +17,10 @@ export default Route.extend({
 	},
 
 	activate() {
-		$('body').addClass('background-color-off-white');
+		$('body').addClass('background-color-theme-light');
 	},
 
 	deactivate() {
-		$('body').removeClass('background-color-off-white');
+		$('body').removeClass('background-color-theme-light');
 	}
-});
\ No newline at end of file
+});
diff --git a/gui/app/router.js b/gui/app/router.js
index b621bd81..3c019c26 100644
--- a/gui/app/router.js
+++ b/gui/app/router.js
@@ -100,9 +100,11 @@ export default Router.map(function () {
 	this.route('profile', {
 		path: 'profile'
 	});
+
 	this.route('search', {
 		path: 'search'
 	});
+
 	this.route('accounts', {
 		path: 'accounts'
 	});
@@ -114,6 +116,4 @@ export default Router.map(function () {
 	this.route('not-found', {
 		path: '/*wildcard'
 	});
-
-	// this.route('pods', function () {});
 });
diff --git a/gui/app/styles/color.scss b/gui/app/styles/color.scss
index b559c821..a839736d 100644
--- a/gui/app/styles/color.scss
+++ b/gui/app/styles/color.scss
@@ -105,9 +105,15 @@ $color-sidebar-toolbar: $color-sidebar-border;
 .background-color-off-white {
 	background-color: $color-off-white !important;
 }
-.background-color-primary {
-	background-color: $color-primary !important;
+.background-color-off-black {
+	background-color: $color-off-black !important;
 }
 .background-color-green {
 	background-color: $color-green !important;
 }
+.background-color-theme {
+	background-color: $color-primary !important;
+}
+.background-color-theme-light {
+	background-color: $color-primary-light !important;
+}
diff --git a/gui/app/styles/mixins.scss b/gui/app/styles/mixins.scss
index 29c684fd..cbb0cc06 100644
--- a/gui/app/styles/mixins.scss
+++ b/gui/app/styles/mixins.scss
@@ -65,3 +65,8 @@
 		color: $color-primary;
 	}
 }
+
+@mixin shadow() {
+	box-shadow: 1px 1px 3px 0px rgba(211,211,211,1);
+}
+
diff --git a/gui/app/styles/view/page-auth.scss b/gui/app/styles/view/page-auth.scss
index d34294ce..41659049 100644
--- a/gui/app/styles/view/page-auth.scss
+++ b/gui/app/styles/view/page-auth.scss
@@ -1,13 +1,13 @@
 .auth-box {
+    display: inline-block;
 	height: 500px;
 	width: 500px;
-	background-color: $color-white;
-	border: 1px solid $color-border;
-    display: inline-block;
-    border-radius : 3px;
-	color: $color-off-black;
 	padding: 20px 50px;
+	background-color: $color-white;
+	color: $color-off-black;
 	@extend .absolute-center;
+	@include border-radius(3px);
+	@include shadow();
 
 	.logo {
 		text-align: center;
diff --git a/gui/app/templates/components/forgot-password.hbs b/gui/app/templates/components/forgot-password.hbs
index 88c0aedc..659dc6ab 100644
--- a/gui/app/templates/components/forgot-password.hbs
+++ b/gui/app/templates/components/forgot-password.hbs
@@ -2,14 +2,15 @@
     {{#if sayThanks}}
         <div class="reset-thanks margin-bottom-30">Thanks. Check your email for instructions.</div>
     {{else}}
-        <div class="input-control">
-            <label>Email</label>
-            {{focus-input type="email" value=email id="email" class=(if hasEmptyEmailError 'error')}}
+        <div class="form-group">
+            <label for="email">Email</label>
+            {{focus-input type="email" value=email id="email" class="form-control {{if hasEmptyEmailError 'is-invalid')}}"}}
         </div>
-        <div class="clearfix" />
-        <div class="margin-top-10 margin-bottom-20">
-            <button type="submit" class="regular-button button-blue">Reset</button>
+        <div class="mt-4">
+            <button type="submit" class="btn btn-primary">Reset</button>
         </div>
     {{/if}}
-    {{#link-to 'auth.login'}}Sign In{{/link-to}}
+	<div class="mt-5">
+	    {{#link-to 'auth.login'}}Click here to sign in{{/link-to}}
+	</div>
 </form>