diff --git a/main.js b/main.js
index a177a86..1752457 100644
--- a/main.js
+++ b/main.js
@@ -126,7 +126,6 @@ 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.sms", {tel: tel, ournumber: ournumber});
                 callback(room.room_id);
             });
         }
@@ -354,7 +353,7 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
                 logger.info("Got request to start new SMS conversation with " + tel + " from " + event.getSender() + ".");
                 sendMatrixNotice(event.getRoomId(), "Starting new conversation with " + tel);
                 createOrJoinSMSRoom(tel, ournumber, function () {
-                    return;
+                    client.setRoomTag(roomid, "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: tel, ournumber: ournumber});
                 });
             }
             return;
@@ -369,7 +368,17 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
             });
         } else {
             client.getRoomTags(room.roomId).then((response) => {
-                console.log(response);
+                if (typeof response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"] != "undefined") {
+                    sendSMS(
+                            response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"].tel,
+                            response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"].ournumber,
+                            sevent.getContent().body,
+                            function () {
+                                client.sendReadReceipt(event, {});
+                            });
+                } else {
+                    sendMatrixNotice(room.roomId, "Error: couldn't determine correct number to send SMS from.");
+                }
             });
         }
     });