diff --git a/config/development.json b/config/development.json
index 3882160cb7..fb8639f30d 100644
--- a/config/development.json
+++ b/config/development.json
@@ -16,5 +16,6 @@
 		"MODE": "in-memory"
 	},
 	"FEATURE_PROMETHEUS_ENABLED": false,
-	"FEATURE_TEAM_CREATE_ROOM_ENABLED": true
+	"FEATURE_TEAM_CREATE_ROOM_ENABLED": true,
+	"LOGIN_BLOCK_TIME": 0
 }
diff --git a/views/authentication/forms/login.hbs b/views/authentication/forms/login.hbs
index f05a083a5b..66dda3cc71 100644
--- a/views/authentication/forms/login.hbs
+++ b/views/authentication/forms/login.hbs
@@ -70,7 +70,7 @@
                 </div>
                 {{> "lib/components/csrfInput"}}
                 <div class="form-group">
-                    {{#if notification.statusCode}}
+                    {{#if notification.timeToWait}}
                         <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login" value="{{$t "home.header.link.login"}}" data-testid="submit-login-email" data-timeout="{{notification.timeToWait}}" disabled/>
                     {{else}}
                         <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login" value="{{$t "home.header.link.login"}}" data-testid="submit-login-email" />
@@ -163,7 +163,7 @@
                         </div>
                         {{> "lib/components/csrfInput"}}
                         <div class="form-group">
-                            {{#if notification.statusCode}}
+                            {{#if notification.timeToWait}}
                                 <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login btn-login-cloud" value="{{$t "login.button.schoolCloud"}}" data-testid="submit-login-email" data-timeout="{{notification.timeToWait}}" disabled/>
                             {{else}}
                                 <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login btn-login-cloud" value="{{$t "login.button.schoolCloud"}}" data-testid="submit-login-email" />
@@ -225,7 +225,7 @@
                         </div>
                         {{> "lib/components/csrfInput"}}
                         <div class="form-group">
-                            {{#if notification.statusCode}}
+                            {{#if notification.timeToWait}}
                                 <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login btn-login-ldap" value="{{$t "login.button.ldap"}}" data-testid="submit-login-ldap" data-timeout="{{notification.timeToWait}}" data-active="true" disabled/>
                             {{else}}
                                 <input autofocus aria-label="login" type="submit" id="submit-login" class="btn btn-block btn-primary btn-login btn-login-ldap" value="{{$t "login.button.ldap"}}" data-testid="submit-login-ldap" data-active="true"/>