diff --git a/client.cpp b/client.cpp
index 9036e08c79..1ae0a3d07f 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1149,6 +1149,11 @@ void Client::fetchName()
     if ( s != cap_normal ) 
         {
         bool reset_name = cap_normal.isEmpty();
+        for( unsigned int i = 0;
+             i < s.length();
+             ++i )
+            if( !s[ i ].isPrint())
+                s[ i ] = ' ';
         cap_normal = s;
         bool was_suffix = ( !cap_suffix.isEmpty());
         cap_suffix = QString::null;