diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index 7d22791916a15eade2a2a6f70402d86c69422477..f163c5230911310f40b4ac0c71d8232b13cb66f7 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -28,7 +28,7 @@ class Language
     /**
      * HTTP GET language parameter name.
      */
-    private $languageParameterName = 'language';
+    private $languageParameterName;
 
 
     /**
@@ -64,7 +64,7 @@ class Language
         if (in_array($language, $this->availableLanguages, true)) {
             $this->language = $language;
             if ($setLanguageCookie === true) {
-                Language::setLanguageCookie($language);
+                self::setLanguageCookie($language);
             }
         }
     }