diff --git a/install/index.php b/install/index.php
index 054c696..df53d61 100644
--- a/install/index.php
+++ b/install/index.php
@@ -199,7 +199,7 @@ $app->post('/', function (Request $request, Response $response, Filesystem $stor
     cleanDirectory(__DIR__.'/../resources/cache');
     cleanDirectory(__DIR__.'/../resources/sessions');
 
-    removeDirectory(__DIR__.'/../install');
+    //removeDirectory(__DIR__.'/../install');
 
     // if is upgrading and existing installation, put it out maintenance
     if ($installed) {
diff --git a/install/templates/install.twig b/install/templates/install.twig
index 2d221e1..673daf5 100644
--- a/install/templates/install.twig
+++ b/install/templates/install.twig
@@ -24,7 +24,7 @@
             <div class="card mt-3">
                 <div class="card-header">Install XBackBone</div>
                 <div class="card-body">
-                    <form method="post" action="">
+                    <form method="post" onsubmit="$('#modalLoading').modal({backdrop: 'static', keyboard: false})">
                         {% if not installed %}
                             <div class="form-group row">
                                 <label for="base_url" class="col-sm-3 col-form-label">Base URL</label>
@@ -184,7 +184,7 @@
 
                             <div class="form-group row justify-content-md-end">
                                 <div class="col-sm-9">
-                                    <button type="submit" class="btn btn-outline-success" onsubmit="$('#modalLoading').modal({backdrop: 'static', keyboard: false})">
+                                    <button type="submit" class="btn btn-outline-success">
                                         <i class="fas fa-save fa-fw"></i> Install
                                     </button>
                                 </div>
@@ -193,7 +193,7 @@
                         {% else %}
                             <div class="form-group row">
                                 <div class="col-sm-12 d-flex justify-content-center">
-                                    <button type="submit" class="btn btn-lg btn-outline-primary" onsubmit="$('#modalLoading').modal({backdrop: 'static', keyboard: false})">
+                                    <button type="submit" class="btn btn-lg btn-outline-primary">
                                         <i class="fas fa-sync fa-fw"></i> Update database
                                     </button>
                                 </div>
diff --git a/resources/templates/dashboard/system.twig b/resources/templates/dashboard/system.twig
index 469ad0d..23c6bc1 100644
--- a/resources/templates/dashboard/system.twig
+++ b/resources/templates/dashboard/system.twig
@@ -124,8 +124,8 @@
                             <div class="col text-center"><span class="text-muted" id="checkForUpdatesMessage"></span></div>
 
                             <div class="col">
-                                <form method="post" action="{{ route('system.upgrade') }}">
-                                    <button type="submit" id="doUpgradeButton" class="btn btn-block btn-outline-success" onsubmit="$('#modalLoading').modal({backdrop: 'static', keyboard: false})" disabled><i class="fas fa-cloud-download-alt fa-fw"></i> {{ lang('upgrade') }}</button>
+                                <form method="post" action="{{ route('system.upgrade') }}" onsubmit="$('#modalLoading').modal({backdrop: 'static', keyboard: false})">
+                                    <button type="submit" id="doUpgradeButton" class="btn btn-block btn-outline-success" disabled><i class="fas fa-cloud-download-alt fa-fw"></i> {{ lang('upgrade') }}</button>
                                 </form>
                             </div>
                         </div>