diff --git a/css/login.css b/css/login.css
index bfa310eb8..ed0e5c81f 100644
--- a/css/login.css
+++ b/css/login.css
@@ -138,6 +138,26 @@ a:hover {
 	border-color: #A0AEC0;
 }
 
+#login-additional-controls > div {
+	text-align: left;
+	margin-top: 10px;
+}
+
+#login-additional-controls input {
+	background-color: #fff;
+	height: 2em;
+	padding: 0.1em 1em;
+	border: solid 2px #DDD;
+	border-radius: 0.25em;
+	width: calc(100% - 2em - 4px);
+}
+
+#login-additional-controls input:focus {
+	border-color: #A0AEC0;
+}
+
+
+
 #login-submit.forgotpwd-submit input,
 #login-submit.changepwd-submit input
 {
diff --git a/templates/login/login.html.twig b/templates/login/login.html.twig
index 83ab0d0e4..e58eb3b36 100644
--- a/templates/login/login.html.twig
+++ b/templates/login/login.html.twig
@@ -30,16 +30,16 @@
 							{{ Macro.BlockExtension(aPluginFormData, 'login_input') }}
 						</div>
 					{% endblock login_input %}
-					{% block login_submit %}
-						<div id="login-submit">
-							{{ Macro.BlockExtension(aPluginFormData, 'login_submit') }}
-						</div>
-					{% endblock login_submit %}
 					{% block login_additional_controls %}
 						<div id="login-additional-controls">
 							{{ Macro.BlockExtension(aPluginFormData, 'login_additional_controls') }}
 						</div>
 					{% endblock login_additional_controls %}
+					{% block login_submit %}
+						<div id="login-submit">
+							{{ Macro.BlockExtension(aPluginFormData, 'login_submit') }}
+						</div>
+					{% endblock login_submit %}
 					{% block login_links %}
 						<div id="login-links">
 							{{ Macro.BlockExtension(aPluginFormData, 'login_links') }}