diff --git a/install b/install
index 47e3752..c672c18 100755
--- a/install
+++ b/install
@@ -802,31 +802,83 @@ if [ "$wo_purge" = "y" ]; then
 else
     # 1 - WO already installed
     if [ -x /usr/local/bin/wo ]; then
-        if ! {
+        if {
             wo -v 2>&1 | grep -q "$wo_version_new"
-        } || [ "$wo_force_install" = "y" ]; then
+        } && [ -z "$wo_force_install" ]; then
+            wo_lib_error "You already have WordOps $wo_version_new"
+            exit 1
+        fi
+        wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
+        wo_install_dep | tee -ai $wo_install_log
+        wo_timesync | tee -ai $wo_install_log
+        wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log
+        wo_backup_wo | tee -ai $wo_install_log
+        secure_wo_db | tee -ai $wo_install_log
+        wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
+        wo_clean | tee -ai $wo_install_log
+        if [ "$wo_travis" = "y" ]; then
+            wo_install_travis | tee -ai $wo_install_log
+        else
+            if [ -f "$HOME/.gitconfig" ]; then
+                wo_install >> $wo_install_log 2>&1
+            else
+                wo_install | tee -ai $wo_install_log
+            fi
+        fi
+        wo_update_latest | tee -ai $wo_install_log
+        if [ ! -d /opt/acme/.sh ]; then
+            wo_lib_echo "Updating acme.sh" | tee -ai $wo_install_log
+            wo_install_acme_sh | tee -ai $wo_install_log
+        fi
+        wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
+        wo_tweak_kernel | tee -ai $wo_install_log
+        if [ ! -f /opt/wo-kernel.sh ]; then
+            wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log
+            wo_systemd_tweak | tee -ai $wo_install_log
+        fi
+        if [ -x /usr/sbin/nginx ]; then
+            wo_nginx_tweak | tee -ai $wo_install_log
+        fi
+        if [ -d /etc/systemd/system/mariadb.service.d ]; then
+            wo_mariadb_tweak | tee -ai $wo_install_log
+        fi
+        wo_cheat_alias | tee -ai $wo_install_log
+        wo_domain_suffix | tee -ai $wo_install_log
+        wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
+        wo_update_wp_cli | tee -ai $wo_install_log
+    else
+        # 2 - Migration from EEv3
+        if [ -x /usr/local/bin/ee ]; then
+            if [ -z "$wo_force_install" ]; then
+                echo -e "Migrate from EasyEngine to WordOps (y/n): " && read -r WO_ANSWER
+                if [ "$WO_ANSWER" != "y" ] && [ "$WO_ANSWER" != "Y" ]; then
+                    wo_lib_error "Not installing WordOps, exit status = " 1
+                    exit 1
+                fi
+            fi
             wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
             wo_install_dep | tee -ai $wo_install_log
             wo_timesync | tee -ai $wo_install_log
-            wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log
-            wo_backup_wo | tee -ai $wo_install_log
+            wo_lib_echo "Backing-up EE install" | tee -ai $wo_install_log
+            wo_backup_ee | tee -ai $wo_install_log
+            wo_lib_echo "Removing EasyEngine cronjob" | tee -ai $wo_install_log
+            wo_remove_ee_cron | tee -ai $wo_install_log
+            wo_lib_echo "Syncing WO database" | tee -ai $wo_install_log
+            wo_sync_db | tee -ai $wo_install_log
             secure_wo_db | tee -ai $wo_install_log
             wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-            wo_clean | tee -ai $wo_install_log
-            if [ "$wo_travis" = "y" ]; then
-                wo_install_travis | tee -ai $wo_install_log
+            if [ -f "$HOME/.gitconfig" ]; then
+                wo_install >> $wo_install_log 2>&1
             else
-                if [ -f "$HOME/.gitconfig" ]; then
-                    wo_install >> $wo_install_log 2>&1
-                else
-                    wo_install | tee -ai $wo_install_log
-                fi
+                wo_install | tee -ai $wo_install_log
+            fi
+            if [ -n "$(command -v nginx)" ]; then
+                wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log
+                wo_upgrade_nginx | tee -ai $wo_install_log
             fi
             wo_update_latest | tee -ai $wo_install_log
-            if [ ! -d /opt/acme/.sh ]; then
-                wo_lib_echo "Updating acme.sh" | tee -ai $wo_install_log
-                wo_install_acme_sh | tee -ai $wo_install_log
-            fi
+            wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
+            wo_install_acme_sh | tee -ai $wo_install_log
             wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
             wo_tweak_kernel | tee -ai $wo_install_log
             if [ ! -f /opt/wo-kernel.sh ]; then
@@ -839,67 +891,13 @@ else
             if [ -d /etc/systemd/system/mariadb.service.d ]; then
                 wo_mariadb_tweak | tee -ai $wo_install_log
             fi
-            wo_cheat_alias | tee -ai $wo_install_log
             wo_domain_suffix | tee -ai $wo_install_log
             wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
+            wo_git_init | tee -ai $wo_install_log
             wo_update_wp_cli | tee -ai $wo_install_log
-        else
-            wo_lib_error "You already have WordOps $wo_version_new, exit status = " 1
-        fi
-    else
-        # 2 - Migration from EEv3
-        if [ -x /usr/local/bin/ee ]; then
-            if [ -z "$wo_force_install" ]; then
-                echo -e "Migrate from EasyEngine to WordOps (y/n): " && read -r WO_ANSWER
-            else
-                WO_ANSWER="y"
-            fi
-            if [ "$WO_ANSWER" = "y" ] || [ "$WO_ANSWER" = "Y" ]; then
-                wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
-                wo_install_dep | tee -ai $wo_install_log
-                wo_timesync | tee -ai $wo_install_log
-                wo_lib_echo "Backing-up EE install" | tee -ai $wo_install_log
-                wo_backup_ee | tee -ai $wo_install_log
-                wo_lib_echo "Removing EasyEngine cronjob" | tee -ai $wo_install_log
-                wo_remove_ee_cron | tee -ai $wo_install_log
-                wo_lib_echo "Syncing WO database" | tee -ai $wo_install_log
-                wo_sync_db | tee -ai $wo_install_log
-                secure_wo_db | tee -ai $wo_install_log
-                wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-                if [ -f "$HOME/.gitconfig" ]; then
-                    wo_install >> $wo_install_log 2>&1
-                else
-                    wo_install | tee -ai $wo_install_log
-                fi
-                if [ -n "$(command -v nginx)" ]; then
-                    wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log
-                    wo_upgrade_nginx | tee -ai $wo_install_log
-                fi
-                wo_update_latest | tee -ai $wo_install_log
-                wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
-                wo_install_acme_sh | tee -ai $wo_install_log
-                wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
-                wo_tweak_kernel | tee -ai $wo_install_log
-                if [ ! -f /opt/wo-kernel.sh ]; then
-                    wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log
-                    wo_systemd_tweak | tee -ai $wo_install_log
-                fi
-                if [ -x /usr/sbin/nginx ]; then
-                    wo_nginx_tweak | tee -ai $wo_install_log
-                fi
-                if [ -d /etc/systemd/system/mariadb.service.d ]; then
-                    wo_mariadb_tweak | tee -ai $wo_install_log
-                fi
-                wo_domain_suffix | tee -ai $wo_install_log
-                wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
-                wo_git_init | tee -ai $wo_install_log
-                wo_update_wp_cli | tee -ai $wo_install_log
-                wo_cheat_alias | tee -ai $wo_install_log
-                wo_lib_echo "Cleaning-up EE previous install" | tee -ai $wo_install_log
-                wo_clean_ee | tee -ai $wo_install_log
-            else
-                wo_lib_error "Not installing WordOps, exit status = " 1
-            fi
+            wo_cheat_alias | tee -ai $wo_install_log
+            wo_lib_echo "Cleaning-up EE previous install" | tee -ai $wo_install_log
+            wo_clean_ee | tee -ai $wo_install_log
         else
             # 3 - Fresh WO setup
             wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log