diff --git a/application/controllers/InstallController.php b/application/controllers/InstallController.php
index 9755f99d7..da320a6b1 100644
--- a/application/controllers/InstallController.php
+++ b/application/controllers/InstallController.php
@@ -33,9 +33,9 @@ class InstallController extends ActionController
     public function indexAction()
     {
         $wizard = $this->createWizard();
-        $wizard->navigate(); // Needs to be called before isSubmittedAndValid() as this creates the form
 
         if ($wizard->isSubmittedAndValid()) {
+            $wizard->navigate();
             if ($wizard->isFinished()) {
                 // TODO: Run the installer (Who creates an installer? How do we handle module installers?)
                 $this->dropConfiguration(); // TODO: Should only be done if the installation has been successfully completed
diff --git a/library/Icinga/Web/Wizard/Wizard.php b/library/Icinga/Web/Wizard/Wizard.php
index 301149f08..2129dac79 100644
--- a/library/Icinga/Web/Wizard/Wizard.php
+++ b/library/Icinga/Web/Wizard/Wizard.php
@@ -288,6 +288,7 @@ class Wizard extends Page
         $pages = $this->getPages();
         $currentStep = $this->getProgress();
 
+        $page->buildForm(); // Needs to get called manually as it's nothing that Zend knows about
         $this->addSubForm($page, $page->getName());
 
         if (!$this->isFirstPage($page)) {
@@ -326,6 +327,7 @@ class Wizard extends Page
         $isFirstSubPage = $wizard->isFirstPage($currentSubPage);
         $isLastSubPage = $wizard->isLastPage($currentSubPage);
 
+        $currentSubPage->buildForm(); // Needs to get called manually as it's nothing that Zend knows about
         $this->addSubForm($currentSubPage, $currentSubPage->getName());
 
         if (!$isFirstPage || !$isFirstSubPage) {