diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 46daf56c92..fd678a6c3d 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -9646,7 +9646,12 @@ function api_get_language_translate_html()
     }
 
     $userInfo = api_get_user_info();
-    $languageId = api_get_language_id($userInfo['language']);
+    $languageId = 0;
+    if (!empty($userInfo['language'])) {
+        $languageId = api_get_language_id($userInfo['language']);
+    } elseif (!empty($_GET['language'])) {
+        $languageId = api_get_language_id($_GET['language']);
+    }
     $languageInfo = api_get_language_info($languageId);
     $isoCode = 'en';
 
diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php
index 6d6db9fc9d..df38b6ab3f 100755
--- a/main/survey/fillsurvey.php
+++ b/main/survey/fillsurvey.php
@@ -1241,6 +1241,10 @@ $url = api_get_self().'?cidReq='.$courseInfo['code'].
     '&course='.$g_c.
     '&invitationcode='.$g_ic.
     '&show='.$show;
+if (!empty($_GET['language'])) {
+    $lang = Security::remove_XSS($_GET['language']);
+    $url .= '&language='.$lang;
+}
 $form = new FormValidator(
     'question',
     'post',
diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php
index 0d7b9eb06f..7164afd3ee 100755
--- a/main/survey/surveyUtil.class.php
+++ b/main/survey/surveyUtil.class.php
@@ -3979,6 +3979,9 @@ class SurveyUtil
         if (!empty($surveyCode)) {
             $params['scode'] = Security::remove_XSS($surveyCode);
         }
+        if (!empty($courseInfo['language'])) {
+            $params['language'] = $courseInfo['language'];
+        }
 
         return api_get_path(WEB_CODE_PATH).'survey/fillsurvey.php?'.http_build_query($params);
     }