diff --git a/cypress/integration/navigation.js b/cypress/integration/navigation.js
index 7e1426aa46..ba45137cbd 100644
--- a/cypress/integration/navigation.js
+++ b/cypress/integration/navigation.js
@@ -1,7 +1,6 @@
 context('Navigation', () => {
 	before(() => {
 		cy.login();
-		cy.visit('/app/website');
 	});
 	it('Navigate to route with hash in document name', () => {
 		cy.insert_doc('ToDo', {'__newname': 'ABC#123', 'description': 'Test this', 'ignore_duplicate': true});
@@ -11,4 +10,15 @@ context('Navigation', () => {
 		cy.go('back');
 		cy.title().should('eq', 'Website');
 	});
+
+	it.only('Navigate to previous page after login', () => {
+		cy.visit('/app/todo');
+		cy.request('/api/method/logout');
+		cy.reload();
+		cy.get('.btn-primary').contains('Login').click();
+		cy.location('pathname').should('eq', '/login');
+		cy.login();
+		cy.visit('/app');
+		cy.location('pathname').should('eq', '/app/todo');
+	});
 });
diff --git a/frappe/public/scss/common/global.scss b/frappe/public/scss/common/global.scss
index 024e0cd2a4..44b6e9ce34 100644
--- a/frappe/public/scss/common/global.scss
+++ b/frappe/public/scss/common/global.scss
@@ -1,3 +1,7 @@
+html, body {
+	height: 100%;
+}
+
 /* checkbox */
 .checkbox {
 	label {
diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss
index ec7fc35cfe..d817adf98a 100644
--- a/frappe/public/scss/desk/global.scss
+++ b/frappe/public/scss/desk/global.scss
@@ -1,5 +1,4 @@
 html {
-	height: 100%;
 	background-color: var(--bg-color);
 }
 
diff --git a/frappe/public/scss/desk/mobile.scss b/frappe/public/scss/desk/mobile.scss
index 839fca9bd2..14fa25e50f 100644
--- a/frappe/public/scss/desk/mobile.scss
+++ b/frappe/public/scss/desk/mobile.scss
@@ -1,9 +1,4 @@
-html {
-	min-height: 100%;
-}
-
 body {
-	height: 100%;
 	// The html and body elements cannot have any padding or margin.
 	margin: 0px;
 	padding: 0px !important;
diff --git a/frappe/public/scss/login.bundle.scss b/frappe/public/scss/login.bundle.scss
index 25fc6662e3..17f33b0a67 100644
--- a/frappe/public/scss/login.bundle.scss
+++ b/frappe/public/scss/login.bundle.scss
@@ -4,12 +4,17 @@ body {
 	background-color: var(--bg-light-gray);
 }
 
-.for-login,
 .for-forgot,
 .for-signup,
 .for-email-login {
 	display: none;
-	margin: 70px 0;
+}
+
+.for-login,
+.for-forgot,
+.for-signup,
+.for-email-login {
+	padding: max(15vh, 70px) 0;
 
 	@include media-breakpoint-up(sm) {
 		.page-card {
diff --git a/frappe/public/scss/website/footer.scss b/frappe/public/scss/website/footer.scss
index 5208afaa11..dc73fd180e 100644
--- a/frappe/public/scss/website/footer.scss
+++ b/frappe/public/scss/website/footer.scss
@@ -85,4 +85,15 @@
 .form-control {
 	border: none;
 	font-size: var(--text-md);
+}
+
+.footer-logo-extension {
+	.input-group {
+		justify-content: flex-end;
+		#footer-subscribe-email, #footer-subscribe-button {
+			max-width: 300px;
+			border: 1px solid var(--dark-border-color);
+			box-shadow: none;
+		}
+	}
 }
\ No newline at end of file
diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index 32b1c46f84..6a6547d79e 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -3,6 +3,7 @@
 .web-form-wrapper {
 	.form-control {
 		color: var(--text-color);
+		background-color: var(--control-bg);
 	}
 
 	.form-section {
diff --git a/frappe/templates/includes/footer/footer_logo_extension.html b/frappe/templates/includes/footer/footer_logo_extension.html
index 17f3218c45..87bb4d14af 100644
--- a/frappe/templates/includes/footer/footer_logo_extension.html
+++ b/frappe/templates/includes/footer/footer_logo_extension.html
@@ -1,13 +1,13 @@
 <div class="footer-logo-extension">
 	<div class="row">
-		<div class="text-left col-6">
+		<div class="text-left col-md-6">
 			{%- if footer_logo -%}
 			<div>
 				<img src="{{ footer_logo }}" alt="Footer Logo" class="footer-logo">
 			</div>
 			{%- endif -%}
 		</div>
-		<div class="text-right col-6">
+		<div class="text-right col-md-6">
 			{% block extension %}
 			{% include "templates/includes/footer/footer_extension.html" %}
 			{% endblock %}
diff --git a/frappe/www/login.html b/frappe/www/login.html
index 90e235e679..4c0c54d76f 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -154,11 +154,11 @@
 				</div>
 			</form>
 			{%- else -%}
-			<div class='page-card-head'>
+			<div class='page-card-head mb-2'>
 				<span class='indicator gray'>{{_("Signup Disabled")}}</span>
+				<p class="text-muted text-normal sign-up-message mt-1 mb-8">{{_("Signups have been disabled for this website.")}}</p>
+				<div><a href='/' class='btn btn-primary btn-md'>{{ _("Home") }}</a></div>
 			</div>
-			<p>{{_("Signups have been disabled for this website.")}}</p>
-			<div><a href='/' class='btn btn-primary btn-sm'>{{ _("Home") }}</a></div>
 			{%- endif -%}
 		</div>
 
diff --git a/frappe/www/message.html b/frappe/www/message.html
index 2919592901..db9deeba1f 100644
--- a/frappe/www/message.html
+++ b/frappe/www/message.html
@@ -39,8 +39,8 @@ html, body {
 {% endif %}
 <script>
 	frappe.ready(function() {
-		if(window.location.hash) {
-			localStorage.setItem('session_last_route', window.location.hash.substr(1));
+		if (window.location.hash || window.location.href.includes('/app')) {
+			localStorage.setItem('session_last_route', window.location.pathname + window.location.hash + window.location.search);
 		}
 
 		$('.btn-primary').focus();