diff --git a/common_functions.php b/common_functions.php
index 75faf069b27..90f52d9a05d 100644
--- a/common_functions.php
+++ b/common_functions.php
@@ -3051,15 +3051,17 @@ function SetSurveyLanguage($surveyid, $language)
             $default_language = $row['language'];
         }
 
-        if (!isset($language) || ($language=='') || (isset($additional_languages) && strpos($additional_languages, $language) === false)
-        or (isset($default_language) && $default_language == $language)
-        ) {
-            // Language not supported, or default language for survey, fall back to survey's default language
+        if (!isset($language) || ($language=='')
+        || (isset($additional_languages) && strpos($additional_languages, $language) === false)
+        || (isset($default_language) && $default_language != $language)
+        )
+        {
+            // Language not supported, fall back to survey's default language
             $_SESSION['s_lang'] = $default_language;
-            //echo "Language not supported, resorting to ".$_SESSION['s_lang']."<br />";
-        } else {
+        }
+        else
+        {
             $_SESSION['s_lang'] = $language;
-            //echo "Language will be set to ".$_SESSION['s_lang']."<br />";
         }
         $clang = new limesurvey_lang($_SESSION['s_lang']);
     }