diff --git a/auth/assets/templates/login.html.tpl b/auth/assets/templates/login.html.tpl
index 32f889e98..b8fff693e 100644
--- a/auth/assets/templates/login.html.tpl
+++ b/auth/assets/templates/login.html.tpl
@@ -43,9 +43,9 @@
 				autocomplete="current-password"
 				aria-label="{{ tr "login.template.form.password.label" }}">
 		</div>
-		{{ if .enableRememberMe }}
 		<div class="row">
 			<div class="col text-right">
+				{{ if .enableRememberMe }}
 				<button
 					class="btn btn-primary btn-block btn-lg"
 					data-test-id="button-login-and-remember"
@@ -55,6 +55,7 @@
 				>
 					{{ tr "login.template.form.button.login-and-remember" }}
 				</button>
+				{{ end }}
 				<button
 					class="btn btn-light btn-block"
 					type="submit"
@@ -63,7 +64,6 @@
 				</button>
 			</div>
 		</div>
-		{{ end }}
 		{{ else }}
 		<div class="row">
 			<div class="col text-right">