diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index 461242c7..8c1b1fa4 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -1167,29 +1167,42 @@ def ask_set_content(silent=False):
             platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80024))
             config.set_setting("videolibrary_kodi", False)
 
+    # configuration during installation
     if not silent:
+        # ask to configure Kodi video library
         if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)):
+            # ask for custom or default settings
             if not platformtools.dialog_yesno(config.get_localized_string(80026), config.get_localized_string(80016), "", "", config.get_localized_string(80017), config.get_localized_string(80018)):
+                # input path and folders
                 path = platformtools.dialog_browse(3, config.get_localized_string(80019), config.get_setting("videolibrarypath"))
-                if path != "":
-                    update_sources(path, config.get_setting("videolibrarypath"))
-                    config.set_setting("videolibrarypath", path)
-                folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020))
-                if folder != "":
-                    config.set_setting("folder_movies", folder)
-                folder = platformtools.dialog_input(config.get_setting("folder_tvshows"), config.get_localized_string(80021))
-                if folder != "":
-                    config.set_setting("folder_tvshows", folder)
-                config.verify_directories_created()
-                do_config(True)
+                movies_folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020))
+                tvshows_folder = platformtools.dialog_input(config.get_setting("folder_tvshows"), config.get_localized_string(80021))
+
+                if path != "" and movies_folder != "" and tvshows_folder != "":
+                    movies_path, tvshows_path = check_sources(filetools.join(path, movies_folder), filetools.join(path, tvshows_folder))
+                    # configure later
+                    if movies_path or tvshows_path:
+                        platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80029))
+                    # set path and folders
+                    else:
+                        update_sources(path, config.get_setting("videolibrarypath"))
+                        config.set_setting("videolibrarypath", path)
+                        config.set_setting("folder_movies", movies_folder)
+                        config.set_setting("folder_tvshows", tvshows_folder)
+                        config.verify_directories_created()
+                        do_config(True)
+                # default path and folders
+                else:
+                    platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80030))
+                    do_config(True)
+            # default settings
             else:
                 platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80027))
                 do_config(False)
+        # configure later
         else:
-            # no hemos aceptado
             platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80022))
-            config.set_setting("videolibrary_kodi", False)
-
+    # configuration from the settings menu
     else:
         platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80023))
         do_config(True)
\ No newline at end of file
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 4c005990..c55001f6 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -6154,7 +6154,7 @@ msgid "Folder name for TV shows"
 msgstr ""
 
 msgctxt "#80022"
-msgid "You can configure the Kodi video library later from the Settings menu inside KoD"
+msgid "You can configure the Kodi video library later from the settings menu inside KoD"
 msgstr ""
 
 msgctxt "#80023"
@@ -6162,7 +6162,7 @@ msgid "You will be asked to choose and configure the information providers for m
 msgstr ""
 
 msgctxt "#80024"
-msgid "An error has occurred during the configuration of the Kodi video library. Please check the log and try again from the Settings menu inside KoD"
+msgid "An error has occurred during the configuration of the Kodi video library. Please check the log and try again from the settings menu inside KoD"
 msgstr ""
 
 msgctxt "#80025"
@@ -6179,4 +6179,12 @@ msgstr ""
 
 msgctxt "#80028"
 msgid "The selected folders are already used by the Kodi library. Please change them"
+msgstr ""
+
+msgctxt "#80029"
+msgid "The selected folders are already used by the Kodi library. Please change them from the settings menu inside KoD"
+msgstr ""
+
+msgctxt "#80030"
+msgid "The default path and folders will be used. You will be asked to choose and configure the information providers for movies and TV shows"
 msgstr ""
\ No newline at end of file
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index 8b4c16a9..49d520e9 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -6179,4 +6179,12 @@ msgstr "Ti verrà chiesto di configurare The Movie Database per i film e The TVD
 
 msgctxt "#80028"
 msgid "The selected folders are already used by the Kodi library. Please change them"
-msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle"
\ No newline at end of file
+msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle"
+
+msgctxt "#80029"
+msgid "The selected folders are already used by the Kodi library. Please change them"
+msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle dal menu impostazioni all'interno di KoD"
+
+msgctxt "#80030"
+msgid "The default path and folders will be used. You will be asked to choose and configure the information providers for movies and TV shows"
+msgstr "Verranno utilizzati il percorso e le cartelle predefiniti. Ti verrà chiesto di scegliere e configurare i provider delle informazioni per film e serie TV"
\ No newline at end of file