--- a/misc_cmd.c	Sun May 15 18:43:36 2005 +0000
+++ b/misc_cmd.c	Sun May 15 18:50:55 2005 +0000
@@ -129,7 +129,7 @@
 	StringID str;
 	Player *p;
 
-	str = AllocateNameUnique((const char*)_decode_parameters, 4);
+	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
@@ -153,7 +153,7 @@
 	StringID str;
 	Player *p;
 
-	str = AllocateNameUnique((const char*)_decode_parameters, 4);
+	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
@@ -162,7 +162,10 @@
 		p->president_name_1 = str;
 
 		if (p->name_1 == STR_SV_UNNAMED) {
-			ttd_strlcat((char*)_decode_parameters, " Transport", sizeof(_decode_parameters));
+			char buf[80];
+
+			snprintf(buf, lengthof(buf), "%s Transport", _cmd_text);
+			_cmd_text = buf;
 			DoCommandByTile(0, 0, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME);
 		}
 		MarkWholeScreenDirty();