Index: src/game/g_client.c
===================================================================
--- src/game/g_client.c	(revision 848)
+++ src/game/g_client.c	(working copy)
@@ -993,7 +993,13 @@
     if( client->pers.connected != CON_CONNECTED )
         Q_strncpyz( oldname, "UnnamedPlayer", sizeof( oldname ) );
 
-    if( client->pers.nameChangeTime &&
+    if( client->pers.muted )
+    {
+      trap_SendServerCommand( ent - g_entities,
+        "print \"You cannot change your name while you are muted\n\"" );
+      revertName = qtrue;
+    }
+    else if( client->pers.nameChangeTime &&
       ( level.time - client->pers.nameChangeTime )
       <= ( g_minNameChangePeriod.value * 1000 ) )
     {