diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 4b1515f998..5bd2bca080 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -145,7 +145,7 @@ define('chat', [
 		require(['scrollStop', 'forum/chats', 'forum/chats/messages'], function (scrollStop, Chats, ChatsMessages) {
 			app.parseAndTranslate('chat', data, function (chatModal) {
 				if (module.modalExists(data.roomId)) {
-					return callback(null);
+					return callback(module.getModal(data.roomId));
 				}
 				var uuid = utils.generateUUID();
 				var dragged = false;
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
index f2c93b18bc..027fcde897 100644
--- a/src/messaging/rooms.js
+++ b/src/messaging/rooms.js
@@ -53,6 +53,7 @@ module.exports = function (Messaging) {
 			db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid),
 		]);
 		await Promise.all([
+			Messaging.addSystemMessage('user-join', uid, roomId),	// chat owner should also get the user-join system message
 			Messaging.addUsersToRoom(uid, toUids, roomId),
 			Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now),
 		]);