diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 779a465..40c488c 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -586,7 +586,7 @@ export default {
       const createEvent = this.room.currentState.getStateEvents("m.room.create","");
       if (createEvent) {
         const creatorId = createEvent.getContent().creator;
-        if (creatorId == this.$matrix.currentUserId && createEvent.getLocalAge() < (2000 * 60000) /* 2 minutes */) {
+        if (creatorId == this.$matrix.currentUserId && createEvent.getLocalAge() < (5 * 60000) /* 5 minutes */) {
           this.showCreatedRoomWelcomeHeader = true;
         }
       }
diff --git a/src/components/LeaveRoomDialog.vue b/src/components/LeaveRoomDialog.vue
index 77d75df..c6145fc 100644
--- a/src/components/LeaveRoomDialog.vue
+++ b/src/components/LeaveRoomDialog.vue
@@ -6,11 +6,11 @@
         <h2 class="dialog-title">
           Goodbye, {{ $matrix.currentUserDisplayName }}.
         </h2>
-        <div v-if="$matrix.currentUser.is_guest" class="dialog-text">
+        <div v-if="$matrix.currentUser.is_guest && onlyJoinedToThisRoom" class="dialog-text">
           If you want to join this group again, you can join under a new identity. To keep {{ $matrix.currentUserDisplayName }}, <a @click.prevent="viewProfile">create an account</a>.
         </div>
         <div v-else class="dialog-text">
-          Since this group is public, you can join again later.
+          You can always join this room again if you know the link.
         </div>
       </template>
       <template v-else>
@@ -82,6 +82,16 @@ export default {
     },
   },
 
+  computed: {
+    onlyJoinedToThisRoom() {
+      const joinedRooms = this.$matrix.joinedRooms;
+      if (joinedRooms && joinedRooms.length == 1 && joinedRooms[0].roomId == this.room.roomId) {
+        return true;
+      }
+      return false;
+    }
+  },
+
   methods: {
     onLeaveRoom() {
       //this.$matrix.matrixClient.forget(this.room.roomId, true, undefined)
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index d2bd115..ca209dd 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -61,6 +61,12 @@ export default {
                 currentRoomId() {
                     return this.$store.state.currentRoomId;
                 },
+
+                joinedRooms() {
+                    return this.rooms.filter(room => {
+                        return room._selfMembership === 'join'
+                    });
+                },
             },
 
             watch: {
@@ -367,7 +373,7 @@ export default {
                     var ids = {};
                     const ret = [];
                     for (const room of this.rooms) {
-                        if (room._selfMembership == 'join') { // && this.getRoomJoinRule(room) == 'invite') {
+                        if (room._selfMembership == 'join' && this.getRoomJoinRule(room) == 'invite') {
                             for (const member of room.getJoinedMembers()) {
                                 if (member.userId != this.currentUserId && !ids[member.userId]) {
                                     ids[member.userId] = member;