diff --git a/files/templates/login/authforms.html b/files/templates/login/authforms.html
index a9f5c949e..dfd7c2087 100644
--- a/files/templates/login/authforms.html
+++ b/files/templates/login/authforms.html
@@ -21,24 +21,13 @@
 		{% endif %}
 	</head>
 
-<body id="login">
-	<nav class="navbar navbar-expand-lg navbar-dark bg-transparent fixed-top border-0">
-		<div class="container-fluid">
-			<button class="navbar-toggler d-none" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
-					aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-					<span class="navbar-toggler-icon"></span>
-			</button>
-		</div>
-	</nav>
-	<div class="container-fluid position-absolute h-100 p-0">
-		<div class="row no-gutters h-100">
+	<body id="login">
+		<div class="container-fluid position-absolute h-100 p-0">
+			<div class="row no-gutters h-100">
 				<div class="col-12 col-md-6 my-auto p-3">
 					<div class="row justify-content-center">
 						<div class="col-10 col-md-7">
-							<div class="mb-5">
-								<a href="/" class="text-decoration-none"><span class="h3 text-primary">‎</span></a>
-							</div>
-							<h1 class="h2">{% block authtitle %}{% endblock %}</h1>
+							<h2>{% block authtitle %}{% endblock %}</h2>
 							<p class="text-muted mb-md-5">{% block authtext %}{% endblock %}</p>
 							{% if error %}
 								<div class="alert alert-danger alert-dismissible fade show d-flex my-3" role="alert">
diff --git a/files/templates/login/login.html b/files/templates/login/login.html
index bdca81a4f..efe39b987 100644
--- a/files/templates/login/login.html
+++ b/files/templates/login/login.html
@@ -1,9 +1,8 @@
 {%- extends 'login/authforms.html' -%}
+{% block authtitle %}Welcome back.{% endblock %}
+{% block authtext %}Glad to have you back!{% endblock %}
 {% block content %}
 	<div id="login-form" class="">
-		<h1 class="h2">Welcome back.</h1>
-		<p class="text-muted mb-md-5">Glad to have you back!</p>
-
 		{% if failed %}
 		<div class="alert alert-danger alert-dismissible fade show d-flex my-3" role="alert">
 			<i class="fas fa-exclamation-circle my-auto"></i>
diff --git a/files/templates/login/login_2fa.html b/files/templates/login/login_2fa.html
index 90799e1e6..b334271dd 100644
--- a/files/templates/login/login_2fa.html
+++ b/files/templates/login/login_2fa.html
@@ -1,8 +1,8 @@
 {%- extends "login/authforms.html" -%}
+{% block authtitle %}Two-step login{% endblock %}
+{% block authtext %}To login, please enter the 6-digit verification code generated in your authenticator app.{% endblock %}
 {%- block content -%}
 <div id="login-form" class="">
-	<h1 class="h2">Two-step login</h1>
-	<p class="text-muted mb-md-5">To login, please enter the 6-digit verification code generated in your authenticator app.</p>
 	{% if failed %}
 		<div class="alert alert-danger alert-dismissible fade show d-flex my-3" role="alert">
 			<i class="fas fa-exclamation-circle my-auto"></i>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 54ca52d83..d325a15aa 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -1,13 +1,20 @@
+{%- extends 'login/authforms.html' -%}
+
+{% set login_namespace = namespace() %}
+{% if ref_user %}
+	{% set login_namespace.authtitle = '@' ~ ref_user.username ~ ' has invited you!' %}
+	{% set login_namespace.authtext = 'Looks like someone wants you to join ' ~ SITE_NAME ~ '.' %}
+{% else %}
+	{% set login_namespace.authtitle = "Create your account." %}
+	{% set login_namespace.authtext = "No email address required." %}
+{% endif %}
+{% if ref_user or not site_settings['login_required'] %}
+	{% block authtitle %}{{login_namespace.authtitle}}{% endblock %}
+	{% block authtext %}{{login_namespace.authtext}}{% endblock %}
+{% endif %}
+
 {%- block content -%}
 	<div id="register-form" class="">
-		{% if ref_user %}
-		<h1 class="h2">@{{ref_user.username}} has invited you!</h1>
-		<p class="text-muted mb-md-2">Looks like someone wants you to join {{SITE_TITLE}}.</p>
-		{% else %}
-		<h1 class="h2">Create your account.</h1>
-		<p class="text-muted mb-md-2">No email address required.</p>
-		{% endif %}
-
 		<form action="/signup" method="post" class="mt-md-3" id="signup">
 			{% if error %}<span class="text-danger">{{error}}</span><br>{% endif %}
 
diff --git a/files/templates/login/sign_up_failed_ref.html b/files/templates/login/sign_up_failed_ref.html
index 39ac6147f..4bd21b1a5 100644
--- a/files/templates/login/sign_up_failed_ref.html
+++ b/files/templates/login/sign_up_failed_ref.html
@@ -1,17 +1,17 @@
 {%- extends "login/authforms.html" -%}
+{%- block authtitle -%}Whoops! You can't refer yourself!{%- endblock -%}
+{%- block authtext -%}Send this link to a friend instead :){%- endblock -%}
 {%- block content -%}
-<div id="register-form" class="">
-	<h1 class="h4 font-weight-normal text-center">Whoops! You can't refer yourself!</h1>
-	<p class="text-center text-muted mb-md-5">Send this link to a friend instead :)</p>
-	<label>Referral code</label>
-	<input autocomplete="off" type="text" class="form-control copy-link" readonly value="{{SITE_FULL}}/signup?ref={{request.values.get('ref')}}" data-clipboard-text="{{SITE_FULL}}/signup?ref={{request.values.get('ref')}}">
+	<div id="register-form" class="">
+		<label>Referral code</label>
+		<input autocomplete="off" type="text" class="form-control copy-link" readonly value="{{SITE_FULL}}/signup?ref={{request.values.get('ref')}}" data-clipboard-text="{{SITE_FULL}}/signup?ref={{request.values.get('ref')}}">
 
-	<div class="text-center mt-5 mb-3">
-		Already have an account? <a href="/login" class="font-weight-bold text-small toggle-login">Log in.</a>
+		<div class="text-center mt-5 mb-3">
+			Already have an account? <a href="/login" class="font-weight-bold text-small toggle-login">Log in.</a>
+		</div>
+	</div>
+	<div class="toast clipboard" id="toast-success" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
+		<div class="toast-body text-center">
+		<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
 	</div>
-</div>
-<div class="toast clipboard" id="toast-success" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
-	<div class="toast-body text-center">
-	<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
-</div>
 {%- endblock -%}
