diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
index d5f44a2d141..86cfe028275 100644
--- a/application/helpers/admin/import_helper.php
+++ b/application/helpers/admin/import_helper.php
@@ -587,6 +587,15 @@ function XMLImportGroup($sFullFilePath, $iNewSID, $bTranslateLinksFields)
     LimeExpressionManager::RevertUpgradeConditionsToRelevance($iNewSID);
     LimeExpressionManager::UpgradeConditionsToRelevance($iNewSID);
 
+    if (count($aQuestionCodeReplacements)) {
+        array_unshift(
+            $results['importwarnings'],
+            "<span class='warningtitle'>"
+            . gT('Attention: Several question codes were updated. Please check these carefully as the update  may not be perfect with customized expressions.')
+            . '</span>'
+        );
+    }
+
     $results['newgid'] = $newgid;
     $results['labelsets'] = 0;
     $results['labels'] = 0;
diff --git a/application/views/questionGroupsAdministration/import_view.php b/application/views/questionGroupsAdministration/import_view.php
index 0d133e7f95d..e99b0d99d51 100644
--- a/application/views/questionGroupsAdministration/import_view.php
+++ b/application/views/questionGroupsAdministration/import_view.php
@@ -37,6 +37,17 @@
                             <li><?php echo gT("Question attributes:") . $aImportResults['question_attributes'] ?></li>
                          </ul>                        
                     </p>
+
+                    <!-- Warnings -->
+                    <?php if (count($aImportResults['importwarnings'])>0): ?>
+                        <h2 class="warning"><?php eT("Warnings");?>:</h2>
+                        <ul  class="list-unstyled">
+                            <?php foreach ($aImportResults['importwarnings'] as $warning): ?>
+                                <li><?php echo $warning; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
+
                     <p class="text-info"><?php eT("Question group import is complete.") ?></p>
                     
                     <!-- button -->