diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index 81deccf83583f8a0883a231d884ce29fb3a14288..a0931f79bccaeb5d42426390cb6a5ca0b3b6314e 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -50,7 +50,7 @@ if (array_key_exists('organization', $_REQUEST)) {
 $errorCode = NULL;
 $errorParams = NULL;
 if ($organizations === NULL || !empty($organization)) {
-	if (!empty($username) && !empty($password)) {
+	if (!empty($username) || !empty($password)) {
 
 		if ($source->getRememberUsernameEnabled()) {
 			$sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();