diff --git a/library/Icinga/Application/WebSetup.php b/library/Icinga/Application/WebSetup.php
index 82a9c59c9..050b201f6 100644
--- a/library/Icinga/Application/WebSetup.php
+++ b/library/Icinga/Application/WebSetup.php
@@ -143,6 +143,11 @@ class WebSetup extends Wizard implements SetupWizard
         }
 
         if ($skip) {
+            if ($this->hasPageData($newPage->getName())) {
+                $pageData = & $this->getPageData();
+                unset($pageData[$newPage->getName()]);
+            }
+
             $pages = $this->getPages();
             if ($this->getDirection() === static::FORWARD) {
                 $nextPage = $pages[array_search($newPage, $pages, true) + 1];