diff --git a/add_missing_indices.sh b/add_missing_indices.sh
index 61c4370..be70042 100755
--- a/add_missing_indices.sh
+++ b/add_missing_indices.sh
@@ -275,68 +275,6 @@ if [[ ! -d ${WEB_BASE_DIR} ]] ; then
 fi
 
 [[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
-# Check PHP Version
-#
-if [[ "$PHP_ENGINE" = "FPM" ]] ; then
-   if [[ -z "$PHP_VERSION" ]] ; then
-      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
-         if $NGINX_IS_ENABLED ; then
-
-            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
-            fi
-
-         elif $APACHE2_IS_ENABLED ; then
-
-            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
-               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
-            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
-            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
-               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
-            fi
-
-         fi
-      fi
-      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
-         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
-                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
-      fi
-      if [[ -z "$PHP_VERSION" ]] ; then
-
-         warn "The PHP version was not specified and cannot be determined!"
-
-         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
-
-         echo ""
-         echo -e "\033[32m--\033[m"
-         echo ""
-         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
-         echo ""
-         echo ""
-         PHP_VERSION=
-         while [ "X$PHP_VERSION" = "X" ]
-         do
-            echononl "   PHP main version: "
-            read PHP_VERSION
-            if [ "X$PHP_VERSION" = "X" ]; then
-               echo ""
-               echo -e "\033[33m\033[1mInput is required !!\033[m"
-               echo ""
-            fi
-            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
-               echo ""
-               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
-               echo ""
-               PHP_VERSION=
-            fi
-
-         done
-
-
-      fi
-   fi
-fi
 
 NGINX_IS_ENABLED=false
 APACHE2_IS_ENABLED=false
@@ -439,6 +377,69 @@ else
    [[ -n "$HTTP_GROUP" ]] || HTTP_GROUP=$DEFAULT_HTTP_GROUP
 fi
 
+# Check PHP Version
+#
+if [[ "$PHP_ENGINE" = "FPM" ]] ; then
+   if [[ -z "$PHP_VERSION" ]] ; then
+      if [[ -z "$VHOST_CONFIG_FILE" ]] ; then
+         if $NGINX_IS_ENABLED ; then
+
+            if [[ -f "/etc/nginx/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="$(realpath "/etc/nginx/sites-enabled/${WEBSITE}.conf")"
+            fi
+
+         elif $APACHE2_IS_ENABLED ; then
+
+            if [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf.php-fpm"
+            elif [[ -f "/usr/local/apache2/conf/vhosts/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/usr/local/apache2/conf/vhosts/${WEBSITE}.conf"
+            elif [[ -f "/etc/apache2/sites-enabled/${WEBSITE}.conf" ]] ; then
+               VHOST_CONFIG_FILE="/etc/apache2/sites-enabled/${WEBSITE}.conf"
+            fi
+
+         fi
+      fi
+      if [[ -n "$VHOST_CONFIG_FILE" ]] ; then
+         PHP_VERSION="$(grep -o -E "^[^#]*php-?[[:digit:]]{1,2}\.[[:digit:]]{1}-fpm" $VHOST_CONFIG_FILE \
+                       | grep -o -E "[[:digit:]]{1,2}\.[[:digit:]]{1}")"
+      fi
+      if [[ -z "$PHP_VERSION" ]] ; then
+
+         warn "The PHP version was not specified and cannot be determined!"
+
+         main_version_regex="^[[:digit:]]{1,2}\.[[:digit:]]{1}$"
+
+         echo ""
+         echo -e "\033[32m--\033[m"
+         echo ""
+         echo "Enter the PHP main version, e.g. 7.4 or 8.0 .."
+         echo ""
+         echo ""
+         PHP_VERSION=
+         while [ "X$PHP_VERSION" = "X" ]
+         do
+            echononl "   PHP main version: "
+            read PHP_VERSION
+            if [ "X$PHP_VERSION" = "X" ]; then
+               echo ""
+               echo -e "\033[33m\033[1mInput is required !!\033[m"
+               echo ""
+            fi
+            if [[ ! $PHP_VERSION =~ $main_version_regex ]] ; then
+               echo ""
+               echo -e "\033[33m\033[1mWrong entry (${PHP_VERSION}) for main PHP version !!\033[m"
+               echo ""
+               PHP_VERSION=
+            fi
+
+         done
+
+
+      fi
+   fi
+fi
+
 
 CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
 CURRENT_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)"