diff --git a/file/js/be.bastelstu.WCF.Chat.coffee b/file/js/be.bastelstu.WCF.Chat.coffee
index 9fbac47..1234831 100644
--- a/file/js/be.bastelstu.WCF.Chat.coffee
+++ b/file/js/be.bastelstu.WCF.Chat.coffee
@@ -86,7 +86,7 @@ window.console ?=
 			
 			# None found -> return firstChars
 			# otherwise return the user at the current offset
-			return if users.length is 0 then firstChars else users[offset % users.length]
+			return if users.length is 0 then firstChars else users[offset % users.length] + ', '
 		###
 		# Binds all the events needed for Tims Chat.
 		###
@@ -141,7 +141,7 @@ window.console ?=
 					return if firstChars.length is 0
 					
 					# Insert name and increment offset
-					$('#timsChatInput').val(@autocompleteValue.substring(0, @autocompleteValue.lastIndexOf(' ') + 1) + @autocomplete(firstChars) + ', ')
+					$('#timsChatInput').val(@autocompleteValue.substring(0, @autocompleteValue.lastIndexOf(' ') + 1) + @autocomplete(firstChars))
 					@autocompleteOffset++
 				else
 					@autocompleteOffset = 0
diff --git a/file/lib/system/chat/command/commands/Info.class.php b/file/lib/system/chat/command/commands/Info.class.php
index c387b6f..2b6f83b 100644
--- a/file/lib/system/chat/command/commands/Info.class.php
+++ b/file/lib/system/chat/command/commands/Info.class.php
@@ -53,6 +53,11 @@ public function __construct(\wcf\system\chat\command\CommandHandler $commandHand
 		$this->didInit();
 	}
 	
+	/**
+	 * Fetches the session-databaseobject for the specified user.
+	 * 
+	 * @return	\wcf\data\session\Session
+	 */
 	public function fetchSession(User $user) {
 		$sql = "SELECT
 				*