diff --git a/command-parser.js b/command-parser.js
index 220ec6d7c0..9bd9aa317b 100644
--- a/command-parser.js
+++ b/command-parser.js
@@ -375,6 +375,7 @@ var Context = exports.Context = (function () {
 		if (commaIndex < 0) {
 			var targetUser = Users.get(target, exactName);
 			this.targetUser = targetUser;
+			this.inputUsername = target.trim();
 			this.targetUsername = targetUser ? targetUser.name : target;
 			return '';
 		}