diff --git a/server/database.js b/server/database.js
index 0a5500ada..7b0b26c38 100644
--- a/server/database.js
+++ b/server/database.js
@@ -231,15 +231,28 @@ class Database {
             }
 
             let statusPage = R.dispense("status_page");
-            statusPage.slug = "";
+            statusPage.slug = "default";
             statusPage.title = title;
             statusPage.description = await setting("description");
             statusPage.icon = await setting("icon");
             statusPage.theme = await setting("statusPageTheme");
-            statusPage.published = await setting("statusPagePublished");
-            statusPage.search_engine_index = await setting("searchEngineIndex");
-            statusPage.show_tags = await setting("statusPageTags");
+            statusPage.published = !!await setting("statusPagePublished");
+            statusPage.search_engine_index = !!await setting("searchEngineIndex");
+            statusPage.show_tags = !!await setting("statusPageTags");
             statusPage.password = null;
+
+            if (!statusPage.title) {
+                statusPage.title = "My Status Page";
+            }
+
+            if (!statusPage.icon) {
+                statusPage.icon = "";
+            }
+
+            if (!statusPage.theme) {
+                statusPage.theme = "light";
+            }
+
             let id = await R.store(statusPage);
 
             await R.exec("UPDATE incident SET status_page_id = ? WHERE status_page_id IS NULL", [
@@ -252,6 +265,13 @@ class Database {
 
             await R.exec("DELETE FROM setting WHERE type = 'statusPage'");
 
+            // Migrate Entry Page if it is status page
+            let entryPage = await setting("entryPage");
+
+            if (entryPage === "statusPage") {
+                await setSetting("entryPage", "statusPage-default", "general");
+            }
+
             console.log("Migrating Status Page - Done");
         }
 
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index f1f915a67..079827079 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -18,7 +18,7 @@
             </a>
 
             <ul class="nav nav-pills">
-                <li class="nav-item me-2">
+                <li v-if="$root.loggedIn" class="nav-item me-2">
                     <router-link to="/manage-status-page" class="nav-link">
                         <font-awesome-icon icon="stream" /> {{ $t("Status Pages") }}
                     </router-link>
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index da60c2fea..9bafc8dc2 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -643,7 +643,7 @@ export default {
         },
 
         unpinIncident() {
-            this.$root.getSocket().emit("unpinIncident", () => {
+            this.$root.getSocket().emit("unpinIncident", this.slug, () => {
                 this.incident = null;
             });
         },