diff --git a/module/install/control.php b/module/install/control.php
index 21de8fceac..4a54271269 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -220,7 +220,7 @@ class install extends control
         }
         $log = trim($log);
         if(!empty($log)) $error = $finish = '';
-        return print(json_encode(array('log' => str_replace("\n", "<br />", $log) . '<br />', 'error' => $error, 'finish' => $finish, 'offset' => $offset + strlen($log))));
+        return print(json_encode(array('log' => str_replace("\n", "<br />", $log) . ($log ? '<br />' : ''), 'error' => $error, 'finish' => $finish, 'offset' => $offset + strlen($log))));
     }
 
     /**
diff --git a/module/install/css/showtableprogress.ui.css b/module/install/css/showtableprogress.ui.css
index 91fb79d6c9..e69ddfa413 100644
--- a/module/install/css/showtableprogress.ui.css
+++ b/module/install/css/showtableprogress.ui.css
@@ -1 +1 @@
-.progress{overflow:auto; display: block;}
+.progress{overflow:auto; height:400px; display: block; white-space: normal;}
diff --git a/module/install/js/showtableprogress.ui.js b/module/install/js/showtableprogress.ui.js
index d946c61726..0b03d33573 100644
--- a/module/install/js/showtableprogress.ui.js
+++ b/module/install/js/showtableprogress.ui.js
@@ -2,10 +2,11 @@ window.showProgress = function(offset)
 {
     $.getJSON($.createLink('install', 'ajaxShowProgress', 'offset=' + offset), function(data)
     {
-        $('#progress').append(data.log);
+        if(!$('.toolbar .toolbar-item.next').hasClass('disabled')) return;
+        if(data.log) $('#progress').append(data.log);
 
         var element = document.getElementById('progress');
-        if(element.scrollHeight > 20000) element.innerHTML = element.innerHTML.substr(40000); // Remove old sql.
+        if(element.scrollHeight > 20000) element.innerHTML = element.innerHTML.substr(60000); // Remove old log.
         element.scrollTop = element.scrollHeight;
 
         if(data.error == '' && data.finish == '') return window.showProgress(data.offset);
@@ -25,6 +26,5 @@ $(document).on('click', '.next:not(.disabled)', function()
     location.href = $.createLink('install', 'step3');
 })
 
-$('.progress').height($(window).height() - 200);
 $.get($.createLink('install', 'ajaxCreateTable'));
 window.showProgress(0);
diff --git a/module/install/ui/showtableprogress.html.php b/module/install/ui/showtableprogress.html.php
index 432113c367..eef03f697d 100644
--- a/module/install/ui/showtableprogress.html.php
+++ b/module/install/ui/showtableprogress.html.php
@@ -33,4 +33,3 @@ div
 );
 
 render('pagebase');
-