diff --git a/ls_survey/ls_survey.module b/ls_survey/ls_survey.module
index a9a2731..2e3288d 100644
--- a/ls_survey/ls_survey.module
+++ b/ls_survey/ls_survey.module
@@ -527,7 +527,14 @@ function ls_survey_form_node_type_form_alter(&$form, &$form_state) {
   $node_type = $form['#node_type'];
   if ($node_type->module == 'ls_survey' || $node_type->module == 'ls_answ') {
 
-    // Disable the overlay.
+    // The validation files need to be called even on cached form, especially
+    // from /admin/structure/types.
+    form_load_include($form_state, 'inc', 'limesurvey_sync', 'limesurvey_sync');
+    form_load_include($form_state, 'inc', 'ls_survey', 'ls_survey.type');
+    form_load_include($form_state, 'inc', 'ls_survey', 'ls_survey');
+    form_load_include($form_state, 'inc', 'ls_answ', 'ls_answ');
+    form_load_include($form_state, 'inc', 'limesurvey_sync', 'ls_api/limesurvey_sync_api_survey');
+
     // Overlay does not like links opening into a new window. Disable it.
     module_load_include('inc', 'limesurvey_sync', 'limesurvey_sync');
     limesurvey_sync_disable_overlay();
@@ -591,6 +598,7 @@ function ls_survey_form_node_type_form_alter(&$form, &$form_state) {
         // Below : note the TRUE parameter, bypass the multilingual option value.
         $drupal_default_lang = ls_answ_validlang_dp_nodelanguage($node_answer, '', TRUE);
         // Make sure this language is enabled.
+        form_load_include($form_state, 'module', 'locale', 'locale');
         module_load_include('module', 'locale');
         $language_list = locale_language_list();
         if (!empty($drupal_default_lang)) {
@@ -609,7 +617,6 @@ function ls_survey_form_node_type_form_alter(&$form, &$form_state) {
             $output = t('You would probably want to <a href="@url">enable</a> the LimeSurvey survey default language (%lang) on you Drupal site.', array('@url' => url('admin/config/regional/language'), '%lang' => $language_list_installed[$drupal_default_lang]));
           }
           else {
-            module_load_include('inc', 'ls_survey', 'ls_survey');
             $output = t('You would probably want to <a href="@url">install</a> the LimeSurvey survey default language (%lang) on you Drupal site.', array('@url' => url('admin/config/regional/language/add'), '%lang' => ls_survey_display_sync_fields('ls_lang', $ls_default_lang)));
           }
         }