diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js
index 83a0ed8c..8b70d664 100755
--- a/app/controllers/users/users.password.server.controller.js
+++ b/app/controllers/users/users.password.server.controller.js
@@ -60,7 +60,7 @@ exports.forgot = function(req, res, next) {
 			res.render('templates/reset-password-email', {
 				name: user.displayName,
 				appName: config.app.title,
-				url: req.protocol+'://' + req.hostname + '/#!/auth/reset/' + token
+				url: req.protocol+'://' + req.headers.host + '/#!/auth/reset/' + token
 			}, function(err, emailHTML) {
 				done(err, emailHTML, user);
 			});
@@ -103,10 +103,10 @@ exports.validateResetToken = function(req, res) {
 		}
 	}, function(err, user) {
 		if (!user) {
-			return res.redirect('/#!/password/reset/invalid');
+			return res.redirect('/#!/auth/reset/invalid');
 		}
 
-		res.redirect('/#!/password/reset/' + req.params.token);
+		res.redirect('/#!/auth/reset/' + req.params.token);
 	});
 };
 
diff --git a/public/modules/core/views/home.client.view.html b/public/modules/core/views/home.client.view.html
index 2c7e6406..c35fb7b1 100755
--- a/public/modules/core/views/home.client.view.html
+++ b/public/modules/core/views/home.client.view.html
@@ -4,7 +4,7 @@
 	<div class="image-background">
 	</div>
 	<div class="jumbotron text-center">
-		<div class="row container" data-ng-if="!authentication.isAuthenticated()">
+		<div class="container" data-ng-if="!authentication.isAuthenticated()">
 			<div class="row text-center logo" style="border-bottom: 1px solid rgba(255,255,255,.2); margin-bottom: 30px;">
 				<h3 class="col-xs-12" style="color: #FA787E; margin-bottom:0px">
 					<i class="fa fa-archive fa-3x"></i>
diff --git a/public/modules/users/config/users.client.routes.js b/public/modules/users/config/users.client.routes.js
index 3565ec2d..ab041033 100755
--- a/public/modules/users/config/users.client.routes.js
+++ b/public/modules/users/config/users.client.routes.js
@@ -78,19 +78,19 @@ angular.module('users').config(['$stateProvider',
 		}).
 
 		state('forgot', {
-			url: '/password/forgot',
+			url: '/auth/forgot',
 			templateUrl: 'modules/users/views/password/forgot-password.client.view.html'
 		}).
 		state('reset-invalid', {
-			url: '/password/reset/invalid',
+			url: '/auth/reset/invalid',
 			templateUrl: 'modules/users/views/password/reset-password-invalid.client.view.html'
 		}).
 		state('reset-success', {
-			url: '/password/reset/success',
+			url: '/auth/reset/success',
 			templateUrl: 'modules/users/views/password/reset-password-success.client.view.html'
 		}).
 		state('reset', {
-			url: '/password/reset/:token',
+			url: '/auth/reset/:token',
 			templateUrl: 'modules/users/views/password/reset-password.client.view.html'
 		});
 	}
diff --git a/public/modules/users/views/authentication/signin.client.view.html b/public/modules/users/views/authentication/signin.client.view.html
index dfacf313..e5e7f7bc 100755
--- a/public/modules/users/views/authentication/signin.client.view.html
+++ b/public/modules/users/views/authentication/signin.client.view.html
@@ -33,7 +33,7 @@
 					<input type="password" id="password" name="password" class="form-control" data-ng-model="credentials.password" placeholder="Password">
 				</div>
 				<div class="forgot-password">
-					<a href="/#!/password/forgot">Forgot your password?</a>
+					<a href="/#!/auth/forgot">Forgot your password?</a>
 				</div>
 				<div class="text-center form-group">
 					<button class="btn btn-primary" ng-click="signin()">Sign in</button>&nbsp; or&nbsp;
diff --git a/public/modules/users/views/password/reset-password-invalid.client.view.html b/public/modules/users/views/password/reset-password-invalid.client.view.html
index d5fc2373..946f95ec 100755
--- a/public/modules/users/views/password/reset-password-invalid.client.view.html
+++ b/public/modules/users/views/password/reset-password-invalid.client.view.html
@@ -1,4 +1,4 @@
 <section class="row text-center">
 	<h3 class="col-md-12">Password reset is invalid</h3>
-	<a href="/#!/password/forgot" class="col-md-12">Ask for a new password reset</a>
+	<a href="/#!/auth/forgot" class="col-md-12">Ask for a new password reset</a>
 </section>
\ No newline at end of file