diff --git a/src/freedombone-installer b/src/freedombone-installer
index 15126ee82218dd1f83ebc9283f4cc1ebab9730f1..c82291c1bb50ec943a116866e8a001aecdf40e40 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -443,24 +443,26 @@ function enable_webadmin_login {
 
 function remove_initial_setup_page {
     if [ -f "$webadmin_install_dir/index.prev" ]; then
+        curr_language=$(web_admin_get_language_subdir)
+
         # Replace the installing screen with the main index page when done
         # It should reload by itself
         if [ -f "$webadmin_install_dir/setup_installing.html" ]; then
-            cp "$webadmin_install_dir/index.prev" "$webadmin_install_dir/setup_installing.html"
+            cp "$webadmin_install_dir/${curr_language}/index.html" "$webadmin_install_dir/setup_installing.html"
         fi
 
         # Replace the setup confirm screen with the main index
         if [ -f "$webadmin_install_dir/setup_confirm.html" ]; then
-            cp "$webadmin_install_dir/index.prev" "$webadmin_install_dir/setup_confirm.html"
+            cp "$webadmin_install_dir/${curr_language}/index.html" "$webadmin_install_dir/setup_confirm.html"
         fi
 
         # Replace the setup domain screen with the main index
         if [ -f "$webadmin_install_dir/setup_domain.html" ]; then
-            cp "$webadmin_install_dir/index.prev" "$webadmin_install_dir/setup_domain.html"
+            cp "$webadmin_install_dir/${curr_language}/index.html" "$webadmin_install_dir/setup_domain.html"
         fi
 
         # Show the web admin index page (not the initial setup page)
-        cp "$webadmin_install_dir/index.prev" "$webadmin_install_dir/index.html"
+        cp "$webadmin_install_dir/${curr_language}/index.html" "$webadmin_install_dir/index.html"
         rm "$webadmin_install_dir/index.prev"
     fi
 
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 35c3aa592afda926d8b6bee6335460641d052e8b..0ba50870e14ffbc8c5fb6a2f47171d2b2892316e 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -625,7 +625,7 @@ function image_install_web_admin {
     mkdir -p "$rootdir$webadmin_install_dir"
     cp -r "$rootdir/usr/share/${PROJECT_NAME}/webadmin"/* "$rootdir$webadmin_install_dir"
     cp "$rootdir/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "$rootdir$webadmin_install_dir"
-    cp "$rootdir$webadmin_install_dir"/index.html "$rootdir$webadmin_install_dir"/index.prev
+    cp "$rootdir$webadmin_install_dir/${language_subdir}"/index.html "$rootdir$webadmin_install_dir"/index.prev
     if [[ "$ONION_ONLY" != 'no' ]]; then
         web_admin_onion_only
     fi
@@ -808,7 +808,7 @@ function install_web_admin {
             cp -r "/usr/share/${PROJECT_NAME}/webadmin"/* "$webadmin_install_dir"
             cp "/usr/share/${PROJECT_NAME}/webadmin/${language_subdir}"/*.html "$webadmin_install_dir"
 
-            cp "$webadmin_install_dir"/index.html "$webadmin_install_dir"/index.prev
+            cp "$webadmin_install_dir/${language_subdir}"/index.html "$webadmin_install_dir"/index.prev
 
             if [ -f "$webadmin_install_dir/.setupscreenactive" ]; then
                 if [ -f "$webadmin_install_dir/setup.prev" ]; then