diff --git a/src/components/Home.vue b/src/components/Home.vue
index adbee17..1fcceb4 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -67,7 +67,7 @@ export default {
     },
 
     createRoom() {
-      this.$navigation.push({ name: "CreateRoom" });
+      this.$navigation.push({ name: "Create" });
     },
   },
 };
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 94a6742..a5696ab 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -222,7 +222,7 @@ export default {
       }
     },
     handleCreateRoom() {
-      this.$navigation.push({ name: "CreateRoom" });
+      this.$navigation.push({ name: "Create" });
     },
     onUsernameEnter() {
       this.$refs.password.focus();
diff --git a/src/components/ProfileInfoPopup.vue b/src/components/ProfileInfoPopup.vue
index ec86bf1..33ec6e3 100644
--- a/src/components/ProfileInfoPopup.vue
+++ b/src/components/ProfileInfoPopup.vue
@@ -108,7 +108,7 @@ export default {
     },
     createRoom() {
       this.showDialog = false;
-      this.$navigation.push({ name: "CreateRoom" });
+      this.$navigation.push({ name: "Create" });
     },
   },
 };
diff --git a/src/components/RoomInfoBottomSheet.vue b/src/components/RoomInfoBottomSheet.vue
index c5bc13e..a317a9c 100644
--- a/src/components/RoomInfoBottomSheet.vue
+++ b/src/components/RoomInfoBottomSheet.vue
@@ -39,7 +39,7 @@ export default {
 
     createRoom() {
       this.close();
-      this.$navigation.push({ name: "CreateRoom" });
+      this.$navigation.push({ name: "Create" });
     }
   }
 };
diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index 1b8895c..95602c2 100644
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -187,7 +187,7 @@ export default {
     },
 
     roomChange(room) {
-      if (room == null || room == undefined) {
+      if (room == null || room == undefined || room == 0) {
         // Ignore, this is caused by "new room" etc.
         return;
       }