diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index 7b879c458ff5fba81493134a35301565b9c594a6..a388e47dfa42b9d7cd7e56d9be17fdd85879a34f 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -31,7 +31,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
 $config = SimpleSAML_Configuration::getInstance();
 $ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
 $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance();
+$session = SimpleSAML_Session::getInstance(TRUE);
 
 
 SimpleSAML_Logger::info('AUTH - ldap-feide: Accessing auth endpoint login-feide');
@@ -39,10 +39,6 @@ SimpleSAML_Logger::info('AUTH - ldap-feide: Accessing auth endpoint login-feide'
 $ldaporgconfig = $ldapconfig->getValue('orgldapconfig');
 
 
-if (empty($session))
-	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-
-
 /*
  * Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.
diff --git a/www/auth/login.php b/www/auth/login.php
index 900235a77b255de3acf0f32786ff762dbd463ae0..604c91f65bd05e0c3c9e6dd04a030f5d72ba7062 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
 
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance(TRUE);
 
 SimpleSAML_Logger::info('AUTH  - ldap: Accessing auth endpoint login');
 
@@ -24,8 +24,6 @@ $error = null;
 $attributes = array();
 $username = null;
 
-if (empty($session))
-	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
 
 /* Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.