diff --git a/common.php b/common.php
index ba54fae4..89b94833 100644
--- a/common.php
+++ b/common.php
@@ -45,7 +45,8 @@ if(isset($CONF['configured'])) {
require_once("$incpath/languages/language.php");
require_once("$incpath/functions.inc.php");
-require_once("$incpath/languages/" . check_language () . ".lang");
+$_SESSION['lang'] = $language = check_language (); # TODO: storing the language only at login instead of calling check_language() on every page would save some processor cycles ;-)
+require_once("$incpath/languages/" . $_SESSION['lang'] . ".lang");
/**
* @param string $class
diff --git a/templates/header.tpl b/templates/header.tpl
index 70c6cdef..a1dedafe 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -15,7 +15,7 @@
Postfix Admin - {$smarty.server.HTTP_HOST}
-
+