diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index 616cda88..89f13016 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -144,6 +144,7 @@ class IrisCore(object):
             })
             return {
                 'status': 1,
+                'connection_id': connection_id,
                 'username': data['username']
             }
 
diff --git a/mopidy_iris/handlers.py b/mopidy_iris/handlers.py
index 67f7791a..3a874ee9 100755
--- a/mopidy_iris/handlers.py
+++ b/mopidy_iris/handlers.py
@@ -71,7 +71,10 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
         else:
             data = {}
 
-        data['connection_id'] = self.connection_id
+        # Handle hard-coded connection_id in messages
+        # Otherwise include the origin connection of this message
+        if 'connection_id' not in data:
+            data['connection_id'] = self.connection_id
 
         if 'request_id' in message:
             request_id = message['request_id']
diff --git a/src/js/views/Debug.js b/src/js/views/Debug.js
index b35f20e1..c65f895b 100755
--- a/src/js/views/Debug.js
+++ b/src/js/views/Debug.js
@@ -162,6 +162,7 @@ class Debug extends React.Component{
 									<option value='{"method":"get_queue_metadata"}'>Get queue metadata</option>
 									<option value='{"method":"broadcast","data":{"type":"browser_notification","title":"Testing","body":"This is my message"}}'>Broadcast to all clients</option>
 									<option value='{"method":"deliver_message","data":{"to":"CONNECTION_ID_HERE","message":{"type":"browser_notification","title":"Testing","body":"This is my message"}}}'>Broadcast to one client</option>
+									<option value='{"method":"set_username","data":{"connection_id":"CONNECTION_ID_HERE","username":"NewUsername"}}}'>Change username</option>
 									<option value='{"method":"refresh_spotify_token"}'>Refresh Spotify token</option>
 									<option value='{"method":"perform_upgrade"}'>Perform upgrade (beta)</option>
 								</select>