diff --git a/src/freedombone-installer b/src/freedombone-installer
index 2b0246d9c8d2194c2c8ddd00da149a300f7e35e5..bfb7382c5a7168d5a94d8fd3ba174b3c612de283 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -160,6 +160,18 @@ function run_setup_command {
     ./$installer_script &
 }
 
+function web_admin_get_language_subdir {
+    if grep -q 'DEFAULT_LANGUAGE=' /root/${PROJECT_NAME}.cfg; then
+        DEFAULT_LANGUAGE=$(grep 'DEFAULT_LANGUAGE=' /root/${PROJECT_NAME}.cfg | head -n 1 | awk -F '=' '{print $2}')
+    fi
+    if [ ! "$DEFAULT_LANGUAGE" ]; then
+        echo 'EN'
+        return
+    fi
+    lang_lower="${DEFAULT_LANGUAGE:0:2}"
+    echo "$lang_lower" | awk '{print toupper($0)}'
+}
+
 function before_setup_runs {
     if [ -f /root/.running_install_command ]; then
         return
@@ -169,7 +181,9 @@ function before_setup_runs {
         return
     fi
 
-    cp "/usr/share/${PROJECT_NAME}/webadmin/setup_installing.html" "$webadmin_install_dir/index.html"
+    curr_language=$(web_admin_get_language_subdir)
+
+    cp "/usr/share/${PROJECT_NAME}/webadmin/${curr_language}/setup_installing.html" "$webadmin_install_dir/index.html"
 
     # get the username and domain from the setup.txt file
     # created by setup.php
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index a7cb396095e0bd044cb051b7ba8b7faffa5ff694..73e59f9bdad529f56543f306b7a2328540f4866c 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -626,6 +626,8 @@ function image_install_web_admin {
       echo "    error_page 405 = \$uri;";
       echo '  }';
       echo '}'; } > "$nginx_file"
+
+    # enable the webadmin site
     chroot "$rootdir" ln -s "/etc/nginx/sites-available/${local_hostname}" /etc/nginx/sites-enabled/
     chroot "$rootdir" chown -R www-data:www-data "/etc/nginx/sites-available/${local_hostname}"