diff --git a/modules/core/www/loginuserpass.php b/modules/core/www/loginuserpass.php
index 88699d7b28ab31a7576e150808107055ca60cddb..eb6db74480a282fd45235d08867d7a3965312f2f 100644
--- a/modules/core/www/loginuserpass.php
+++ b/modules/core/www/loginuserpass.php
@@ -20,6 +20,8 @@ $state = SimpleSAML_Auth_State::loadState($authStateId, sspmod_core_Auth_UserPas
 
 if (array_key_exists('username', $_REQUEST)) {
 	$username = $_REQUEST['username'];
+} elseif (isset($state['core:username'])) {
+	$username = (string)$state['core:username'];
 } else {
 	$username = '';
 }
@@ -30,7 +32,7 @@ if (array_key_exists('password', $_REQUEST)) {
 	$password = '';
 }
 
-if (!empty($username) || !empty($password)) {
+if (!empty($_REQUEST['username']) || !empty($password)) {
 	/* Either username or password set - attempt to log in. */
 
 	if (array_key_exists('forcedUsername', $state)) {
diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index 57bbdb65641bf50a85cbddb99c8c05da02f42618..bba9d798d3e232ff50ccdaf009282cf72607d7c6 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -18,6 +18,8 @@ $organizations = sspmod_core_Auth_UserPassOrgBase::listOrganizations($authStateI
 
 if (array_key_exists('username', $_REQUEST)) {
 	$username = $_REQUEST['username'];
+} elseif (isset($state['core:username'])) {
+	$username = (string)$state['core:username'];
 } else {
 	$username = '';
 }
@@ -30,6 +32,8 @@ if (array_key_exists('password', $_REQUEST)) {
 
 if (array_key_exists('organization', $_REQUEST)) {
 	$organization = $_REQUEST['organization'];
+} elseif (isset($state['core:organization'])) {
+	$organization = (string)$state['core:organization'];
 } else {
 	$organization = '';
 }