diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 97c9e49a8d..8a9b79f94d 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -124,8 +124,8 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         """
         Support escaping of = with \=
         """
-        args = self.args
         super(CmdNick, self).parse()
+        args = (self.lhs or "") + " = %s" % self.rhs if self.rhs else ""
         parts = re.split(r"(?<!\\)=", args, 1)
         self.rhs = None
         if len(parts) < 2: