diff --git a/modules/core/lib/Auth/Process/LanguageAdaptor.php b/modules/core/lib/Auth/Process/LanguageAdaptor.php
index 922be05845529c14698982fc0e47eae76e5a101e..5cc4f6be84401b428df7fcda98c44c10c182a29e 100644
--- a/modules/core/lib/Auth/Process/LanguageAdaptor.php
+++ b/modules/core/lib/Auth/Process/LanguageAdaptor.php
@@ -45,9 +45,7 @@ class sspmod_core_Auth_Process_LanguageAdaptor extends SimpleSAML_Auth_Processin
 		if (array_key_exists($this->langattr, $attributes))
 			$attrlang = $attributes[$this->langattr][0];
 
-		$config = SimpleSAML_Configuration::getInstance();
-		$t = new SimpleSAML_XHTML_Template($config, 'frontpage');
-		$lang = $t->getLanguage(FALSE, FALSE);
+		$lang = SimpleSAML_XHTML_Template::getLanguageCookie();
 
 
 		if (isset($attrlang))
@@ -58,8 +56,7 @@ class sspmod_core_Auth_Process_LanguageAdaptor extends SimpleSAML_Auth_Processin
 
 		if (isset($attrlang) && !isset($lang)) {
 			/* Language set in attribute but not in cookie - update cookie. */
-			$t->setLanguage($attrlang);
-			$_GET['language'] = $attrlang;
+			SimpleSAML_XHTML_Template::setLanguageCookie($attrlang);
 		} elseif (!isset($attrlang) && isset($lang)) {
 			/* Language set in cookie, but not in attribute. Update attribute. */
 			$request['Attributes'][$this->langattr] = array($lang);