diff --git a/core/control/ContentController.php b/core/control/ContentController.php
index a2d78232e..8d2f143e9 100644
--- a/core/control/ContentController.php
+++ b/core/control/ContentController.php
@@ -322,6 +322,14 @@ HTML;
 	 * This action is called by the installation system
 	 */
 	function successfullyinstalled() {
+		// The manifest should be built by now, so it's safe to publish the 404 page
+		$fourohfour = Versioned::get_one_by_stage('ErrorPage', 'Stage', 'ErrorCode = 404');
+		if($fourohfour) {
+			$fourohfour->Status = "Published";
+			$fourohfour->write();
+			$fourohfour->publish("Stage", "Live");
+		}
+		
 		$title = new Varchar("Title");
 		$content = new HTMLText("Content");
 		$username = Session::get('username');