diff --git a/app/Http/Controllers/Install/InstallationController.php b/app/Http/Controllers/Install/InstallationController.php
index c8f2ae24c0..ea256f4c5b 100644
--- a/app/Http/Controllers/Install/InstallationController.php
+++ b/app/Http/Controllers/Install/InstallationController.php
@@ -59,8 +59,9 @@ class InstallationController extends Controller
 
     public function stepsCompleted()
     {
-        return response()->json(array_map(function ($controller) {
-            return $controller::enabled($this->steps);
+        return response()->json(array_map(function ($class) {
+            $controller = app()->make($class);
+            return $controller->enabled($this->steps);
         }, $this->steps));
     }
 
diff --git a/resources/views/install/database.blade.php b/resources/views/install/database.blade.php
index 40d92621d7..c5457cf461 100644
--- a/resources/views/install/database.blade.php
+++ b/resources/views/install/database.blade.php
@@ -63,7 +63,7 @@
             </form>
         </div>
     </div>
-    <div id="migration-output" class="row">
+    <div id="migration-output" class="row install-show-migrate">
         <div class="col-12">
             <label for="db-update">@lang('install.migrate.building')<br />@lang('install.migrate.building_interrupt')</label>
             <textarea readonly id="db-update" class="form-control" rows="20" placeholder="@lang('install.migrate.wait')"></textarea>
@@ -83,7 +83,7 @@
         $('#database-form').submit(function (event) {
             event.preventDefault();
             $('#database-status>i').attr('class', 'fa fa-2x fa-spinner fa-spin');
-            $('.db-error').remove();
+            $('#error-box').empty();
 
             $.ajax({
                 type: 'POST',
diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php
index da8839eb1a..0c1172f86e 100644
--- a/resources/views/layouts/install.blade.php
+++ b/resources/views/layouts/install.blade.php
@@ -81,8 +81,7 @@
                 @foreach($steps as $step => $controller)
                     <div>
                         <a href="{{ route('install.' . $step) }}"
-                           id="install-{{ $step }}-button"
-                           class="btn btn-info btn-circle @if(!$controller->enabled($steps)) disabled @endif"
+                           class="install-enable-{{ $step }} btn btn-info btn-circle @if(!$controller->enabled($steps)) disabled @endif"
                            title="@lang("install.$step.title")"
                         >
                             <i class="fa fa-lg {{ $controller->icon() }}"></i>
@@ -117,11 +116,12 @@
         .success(function (data) {
             console.log(data);
             Object.keys(data).forEach(function (key) {
-                var button = $('#install-' + key + '-button');
                 if (data[key]) {
-                    button.removeClass('disabled')
+                    $('.install-enable-' + key).removeClass('disabled');
+                    $('.install-show-' + key).show();
                 } else {
-                    button.addClass('disabled')
+                    $('.install-enable-' + key).addClass('disabled');
+                    $('.install-show-' + key).hide();
                 }
             });
         })