diff --git a/main.js b/main.js
index 9803fa7..dce253d 100644
--- a/main.js
+++ b/main.js
@@ -125,6 +125,8 @@ function createOrJoinSMSRoom(tel, ournumber, callback) {
             // not in the room, join it
             client.joinRoom(res.room_id).then((room) => {
                 logger.debug("Room " + roomName + " joined.");
+                client.setRoomTag(room.room_id, "com.netsyms.matrix-bridge-voxtelesys.smstel", tel);
+                client.setRoomTag(room.room_id, "com.netsyms.matrix-bridge-voxtelesys.ournumber", ournumber);
                 callback(room.room_id);
             });
         }
@@ -358,7 +360,9 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
             return;
         }
         //sendMatrix(room.roomId, "echo " + event.event.content.body);
-        const matches = room.name.match(/([1-9][0-9]+)/g);
+        const roomTags = client.getRoomTags(room.roomId, function (resp) {
+            console.log(resp);
+        });
         if (matches.length == 1) {
             var tel = matches[0];
             logger.info("Got message for " + tel + " from " + event.getSender() + ", relaying.");