diff --git a/core/js/login/authpicker.js b/core/js/login/authpicker.js
index 8aaaf3d7361c1..1a94b02d72f95 100644
--- a/core/js/login/authpicker.js
+++ b/core/js/login/authpicker.js
@@ -10,4 +10,6 @@ jQuery(document).ready(function() {
 		e.preventDefault();
 		document.location.href = e.target.attributes.action.value
 	})
+
+	$('#login-form input').removeAttr('disabled');
 })
diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php
index 68c53818a9236..3f78081921d3e 100644
--- a/core/templates/loginflow/authpicker.php
+++ b/core/templates/loginflow/authpicker.php
@@ -47,7 +47,7 @@
 
 	<p id="redirect-link">
 		<form id="login-form" action="<?php p($urlGenerator->linkToRoute('core.ClientFlowLogin.grantPage', ['stateToken' => $_['stateToken'], 'clientIdentifier' => $_['clientIdentifier'], 'oauthState' => $_['oauthState'], 'user' => $_['user'], 'direct' => $_['direct']])) ?>" method="get">
-			<input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Log in')) ?>">
+			<input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Log in')) ?>" disabled>
 		</form>
 	</p>
 
diff --git a/core/templates/loginflowv2/authpicker.php b/core/templates/loginflowv2/authpicker.php
index b7ff617bd309c..0e18cc99ce15f 100644
--- a/core/templates/loginflowv2/authpicker.php
+++ b/core/templates/loginflowv2/authpicker.php
@@ -47,7 +47,7 @@
 
 	<p id="redirect-link">
 		<form id="login-form" action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.grantPage', ['stateToken' => $_['stateToken'], 'user' => $_['user']])) ?>" method="get">
-			<input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Log in')) ?>">
+			<input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Log in')) ?>" disabled>
 		</form>
 	</p>