diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 887e0e844..2d0530549 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -143,6 +143,10 @@ public function boot(IBootContext $context): void {
 					}
 				}
 
+				if ($appConfig->getAppValueBool('general-nextcloud_login_form')) {
+					return;
+				}
+
 				$redirectSituation = false;
 
 				$user = $userSession->getUser();
@@ -221,19 +225,17 @@ public function boot(IBootContext $context): void {
 						$originalUrl = $urlGenerator->getAbsoluteURL($params['redirect_url']);
 					}
 
-					if (!$appConfig->getAppValueBool('general-nextcloud_login_form')) {
-						$csrfToken = $csrfTokenManager->getToken();
-						$targetUrl = $urlGenerator->linkToRouteAbsolute(
-							'user_saml.SAML.login',
-							[
-								'requesttoken' => $csrfToken->getEncryptedValue(),
-								'originalUrl' => $originalUrl,
-								'idp' => array_keys($configuredIdps)[0] ?? '',
-							]
-						);
-						header('Location: ' . $targetUrl);
-						exit();
-					}
+					$csrfToken = $csrfTokenManager->getToken();
+					$targetUrl = $urlGenerator->linkToRouteAbsolute(
+						'user_saml.SAML.login',
+						[
+							'requesttoken' => $csrfToken->getEncryptedValue(),
+							'originalUrl' => $originalUrl,
+							'idp' => array_keys($configuredIdps)[0] ?? '',
+						]
+					);
+					header('Location: ' . $targetUrl);
+					exit();
 				}
 			});
 		} catch (Throwable $e) {