Index: client/client.c
===================================================================
--- client/client.c	(revision 6386)
+++ client/client.c	(working copy)
@@ -3472,6 +3472,8 @@
 
 	if ( strlen(calling_name) != 0 )
 		set_global_myname( calling_name );
+	else
+		pstrcpy( calling_name, global_myname() );
 
 	if(poptPeekArg(pc)) {
 		pstrcpy(service,poptGetArg(pc));