diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index 1c151fff84e2d81f8d3d677fbe1edf9b1fd65ef7..a2c73087a6785f23135b7637014e65f0022136cc 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -78,9 +78,11 @@ abstract class sspmod_core_Auth_UserPassOrgBase extends SimpleSAML_Auth_Source {
 		// Get the remember username config options
 		if (isset($config['remember.username.enabled'])) {
 			$this->rememberUsernameEnabled = (bool) $config['remember.username.enabled'];
+			unset($config['remember.username.enabled']);
 		}
 		if (isset($config['remember.username.checked'])) {
 			$this->rememberUsernameChecked = (bool) $config['remember.username.checked'];
+			unset($config['remember.username.checked']);
 		}
 
 		$this->usernameOrgMethod = 'none';