diff --git a/src/Message.js b/src/Message.js
index fa65ea3..a1ccef2 100644
--- a/src/Message.js
+++ b/src/Message.js
@@ -190,7 +190,7 @@ module.exports = (cl) => {
             if(!cl.quotas.userset.attempt()) return;
             cl.user.name = msg.set.name;
             let user = new User(cl);
-            Database.getUserData().then((usr) => {
+            Database.getUserData(cl, cl.server).then((usr) => {
                 let dbentry = user.userdb.get(cl.user._id);
                 if (!dbentry) return;
                 dbentry.name = msg.set.name;
diff --git a/src/Room.js b/src/Room.js
index 101ad23..924c15d 100644
--- a/src/Room.js
+++ b/src/Room.js
@@ -129,7 +129,9 @@ class Room extends EventEmitter {
         }
 
         this.connections.forEach((usr) => {
-            this.server.connections.get(usr.connectionid).sendArray([this.fetchData(usr, cl)])
+            let u = this.fetchData(usr, cl);
+            u.ip = undefined;
+            this.server.connections.get(usr.connectionid).sendArray([u])
         });
 
         this.server.updateRoom(this.fetchData());