diff --git a/modules/core/lib/Controller/Login.php b/modules/core/lib/Controller/Login.php
index af0c4bf8db1757c2f9fffdfc77bbe0932ec9cde7..c38de336076747344cb4a356fdeaec1b8cf38cde 100644
--- a/modules/core/lib/Controller/Login.php
+++ b/modules/core/lib/Controller/Login.php
@@ -223,9 +223,9 @@ class Login
 
                 try {
                     if ($source instanceof UserPassOrgBase) {
-                        UserPassBase::handleLogin($authStateId, $username, $password);
-                    } else {
                         UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
+                    } else {
+                        UserPassBase::handleLogin($authStateId, $username, $password);
                     }
                 } catch (Error\Error $e) {
                     // Login failed. Extract error code and parameters, to display the error