diff --git a/app/Listeners/Updates/Version130.php b/app/Listeners/Updates/Version130.php
index 2d1d36b66..4696b1aaa 100644
--- a/app/Listeners/Updates/Version130.php
+++ b/app/Listeners/Updates/Version130.php
@@ -46,7 +46,7 @@ class Version130 extends Listener
         // Set new Item Reminder settings
         setting(['general.send_item_reminder' => '0']);
         setting(['general.schedule_item_stocks' => '3,5,7']);
-        setting(['general.wizard' => '0']);
+        setting(['general.wizard' => '1']);
 
         setting()->save();
     }
diff --git a/resources/views/layouts/wizard.blade.php b/resources/views/layouts/wizard.blade.php
index 3249fe754..80bdc3f9a 100644
--- a/resources/views/layouts/wizard.blade.php
+++ b/resources/views/layouts/wizard.blade.php
@@ -10,5 +10,11 @@
         </div>
 
         @stack('body_end')
+
+        <script type="text/javascript">
+            $('#wizard-skip').on('click', function() {
+                $('#wizard-loading').html('<span class="wizard-loading-bar"><span class="wizard-loading-spin"><i class="fa fa-spinner fa-spin"></i></span></span>');
+            });
+        </script>
     </body>
 </html>
diff --git a/resources/views/partials/wizard/head.blade.php b/resources/views/partials/wizard/head.blade.php
index 95ceb8001..594a1c98c 100644
--- a/resources/views/partials/wizard/head.blade.php
+++ b/resources/views/partials/wizard/head.blade.php
@@ -34,6 +34,40 @@
     @stack('css')
 
     @stack('stylesheet')
+    <style type="text/css">
+        .wizard-loading-bar {
+            font-size: 35px;
+            position: absolute;
+            z-index: 999999;
+            width: 100%;
+            height: 100%;
+            background: rgb(136, 136, 136);
+            opacity: 0.2;
+            -moz-border-radius-bottomleft: 1px;
+            -moz-border-radius-bottomright: 1px;
+            border-bottom-left-radius: 1px;
+            border-bottom-right-radius: 1px;font-size: 35px;
+            position: absolute;
+            z-index: 999999;
+            width: 100%;
+            height: 100%;
+            background: rgb(136, 136, 136);
+            opacity: 0.2;
+            -moz-border-radius-bottomleft: 1px;
+            -moz-border-radius-bottomright: 1px;
+            border-bottom-left-radius: 1px;
+            border-bottom-right-radius: 1px;
+        }
+
+        .wizard-loading-spin {
+            font-size: 100px;
+            position: absolute;
+            margin: auto;
+            color: #fff;
+            padding: 8% 40%;
+            z-index: 9999;
+        }
+    </style>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index 7ef0812d5..e1d9805d5 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -30,6 +30,8 @@
 </div>
 
 <div class="box box-success">
+    <div id="wizard-loading"></div>
+
     {!! Form::model($company, ['method' => 'PATCH', 'files' => true, 'url' => ['wizard/companies'], 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-header with-border">
@@ -67,7 +69,7 @@
         <div class="col-md-12">
             <div class="form-group no-margin">
                 {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success  button-submit', 'data-loading-text' => trans('general.loading')]) !!}
-                <a href="{{ url('wizard/currencies') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+                <a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index ad76cc1e5..e6ef4001b 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -30,6 +30,8 @@
 </div>
 
 <div class="box box-success">
+    <div id="wizard-loading"></div>
+
     <div class="box-header with-border">
         <h3 class="box-title">{{ trans_choice('general.currencies', 1) }}</h3>
         <span class="new-button"><a href="{{ url('settings/currencies/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@@ -98,7 +100,7 @@
     <div class="box-footer">
         <div class="col-md-12">
             <div class="form-group no-margin">
-                <a href="{{ url('wizard/taxes') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+                <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index 62cd768e7..be51493e5 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -30,6 +30,8 @@
 </div>
 
 <div class="box box-success">
+    <div id="wizard-loading"></div>
+
     <div class="box-header with-border">
         <h3 class="box-title">{{ trans_choice('general.taxes', 1) }}</h3>
         <span class="new-button"><a href="{{ url('settings/taxes/create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@@ -96,7 +98,7 @@
     <div class="box-footer">
         <div class="col-md-12">
             <div class="form-group no-margin">
-                <a href="{{ url('wizard/finish') }}" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+                <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-default"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
             </div>
         </div>
     </div>