diff --git a/classes/handler/public.php b/classes/handler/public.php
index 2b5169ca7..d5933a18c 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -510,7 +510,10 @@ class Handler_Public extends Handler {
 			if (authenticate_user($login, $password)) {
 				$_POST["password"] = "";
 
-				$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
+				if (get_schema_version() >= 120) {
+					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+				}
+
 				$_SESSION["ref_schema_version"] = get_schema_version(true);
 				$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
diff --git a/include/functions.php b/include/functions.php
index b3130104b..c39b4938c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -97,8 +97,8 @@
 			$lang = _TRANSLATION_OVERRIDE_DEFAULT;
 		}
 
-		if ($_SESSION["uid"]) {
-			$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
+		if ($_SESSION["uid"] && get_schema_version() >= 120) {
+			$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
 
 			if ($pref_lang) {
 				$lang = $pref_lang;