diff --git a/server/handlers/chat.js b/server/handlers/chat.js
index dfb4ad71..d5af37df 100644
--- a/server/handlers/chat.js
+++ b/server/handlers/chat.js
@@ -103,7 +103,7 @@ var generate_name = function(guid, announce_payload) {
         } else if(announce_payload.message && !announce_payload.all) {
           io.to(announce_payload.channel).emit('chat', {from: name, msg: ": " + announce_payload.message});
         } else if(announce_payload.message && announce_payload.all) {
-          io.sockets.emit('chat.all', {from: docs[0].name, msg: ": " + announce_payload.message, channel: coll});
+          io.sockets.emit('chat.all', {from: name, msg: ": " + announce_payload.message, channel: coll});
         }
       });
     } else {
diff --git a/server/server.js b/server/server.js
index db4f8a54..23f6003a 100755
--- a/server/server.js
+++ b/server/server.js
@@ -108,7 +108,7 @@ app.get('/robots.txt', function (req, res) {
 app.use(function (req, res, next) {
 	var cookie = req.cookies._uI;
 	if (cookie === undefined) {
-		var user_name = rndName(uniqid.time(), 15);
+		var user_name = Functions.rndName(uniqid.time(), 15);
 		res.cookie('_uI',user_name, { maxAge: 365 * 10000 * 3600000 });
 	}
 	next();