diff --git a/src/mibew/libs/classes/Mibew/Controller/InstallController.php b/src/mibew/libs/classes/Mibew/Controller/InstallController.php
index d706a9c6..96fffe25 100644
--- a/src/mibew/libs/classes/Mibew/Controller/InstallController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/InstallController.php
@@ -90,8 +90,8 @@ class InstallController extends AbstractController
 
         $installer = $this->getInstaller();
         if (!$installer->checkRequirements()) {
-            return $this->renderError(
-                'install_err',
+            return $this->renderStep(
+                'install_step',
                 array('errors' => $installer->getErrors())
             );
         }
@@ -123,8 +123,8 @@ class InstallController extends AbstractController
 
         $installer = $this->getInstaller();
         if (!$installer->checkConnection()) {
-            return $this->renderError(
-                'install_err',
+            return $this->renderStep(
+                'install_step',
                 array('errors' => $installer->getErrors())
             );
         }
@@ -156,8 +156,8 @@ class InstallController extends AbstractController
 
         $installer = $this->getInstaller();
         if (!$installer->createTables()) {
-            return $this->renderError(
-                'install_err',
+            return $this->renderStep(
+                'install_step',
                 array('errors' => $installer->getErrors())
             );
         }
@@ -230,8 +230,8 @@ class InstallController extends AbstractController
 
         $installer = $this->getInstaller();
         if (!$installer->setPassword($password)) {
-            return $this->renderError(
-                'install_err',
+            return $this->renderStep(
+                'install_step',
                 array('errors' => $installer->getErrors())
             );
         }
@@ -265,8 +265,8 @@ class InstallController extends AbstractController
 
         $installer = $this->getInstaller();
         if (!$installer->importLocales()) {
-            return $this->renderError(
-                'install_err',
+            return $this->renderStep(
+                'install_step',
                 array('errors' => $installer->getErrors())
             );
         }
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars
index 48d8fc95..3266f66e 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars
@@ -27,24 +27,26 @@
                             {{/each}}
                         </ul>
 
-                        {{#block "nextStep"}}
-                            {{#if nextstep}}
-                                <br/>
-                                <br/>
+                        {{#unless errors}}
+                            {{#block "nextStep"}}
+                                {{#if nextstep}}
+                                    <br/>
+                                    <br/>
 
-                                {{l10n "Next step:"}}
+                                    {{l10n "Next step:"}}
 
-                                <ul>
-                                    <li>
-                                        {{#if nextnotice}}
-                                            {{{nextnotice}}}<br/><br/>
-                                        {{/if}}
+                                    <ul>
+                                        <li>
+                                            {{#if nextnotice}}
+                                                {{{nextnotice}}}<br/><br/>
+                                            {{/if}}
 
-                                        <a href="{{nextstepurl}}">{{nextstep}}</a>
-                                    </li>
-                                </ul>
-                            {{/if}}
-                        {{/block}}
+                                            <a href="{{nextstepurl}}">{{nextstep}}</a>
+                                        </li>
+                                    </ul>
+                                {{/if}}
+                            {{/block}}
+                        {{/unless}}
                     </div>
 
                     <div class="formbottom">