diff --git a/client/lib/RoomHistoryManager.coffee b/client/lib/RoomHistoryManager.coffee
index 32d498ceb3f1f4e65b490fa717247136ae869653..8328cafc7b99b430fe167fd6017814049bdf8d56 100644
--- a/client/lib/RoomHistoryManager.coffee
+++ b/client/lib/RoomHistoryManager.coffee
@@ -1,5 +1,5 @@
 @RoomHistoryManager = new class
-	defaultLimit = 20
+	defaultLimit = 50
 
 	histories = {}
 
diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index aac1d7d079cb94f5a3a1b806f4e87c965f02c45c..eb0f5871281696611f4d7f9b58e685dca902266c 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -41,8 +41,8 @@ Meteor.methods
 				ChatMessage.insert
 					rid: '57om6EQCcFami9wuT'
 					ts: new Date()
-					t: 'wm'
-					msg: username
+					t: 'uj'
+					msg: ''
 					u:
 						_id: user._id
 						username: username