diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index ca0e68d93c..758df95d14 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -397,7 +397,7 @@ - (NSArray*) output: (NSMutableDictionary*)d
   authors = [info objectForKey: @"authors"];
   if (authors == nil)
     {
-      tmp = [NSString stringWithFormat: @"Generated by %@", NSUserName()];
+      tmp = [NSString stringWithFormat: @"Generated by %@", NSFullUserName()];
       [str appendString: @"    <author name=\""];
       [str appendString: tmp];
       [str appendString: @"\"></author>\n"];
@@ -2365,7 +2365,8 @@ - (NSString*) mergeMarkup: (NSString*)markup
 	  [str appendString: @"    <title>"];
 	  [str appendString: kind];
 	  [str appendString: @"</title>\n"];
-	  tmp = [NSString stringWithFormat: @"Generated by %@", NSUserName()];
+	  tmp = [NSString stringWithFormat: @"Generated by %@",
+	    NSFullUserName()];
 	  [str appendString: @"    <author name=\""];
 	  [str appendString: tmp];
 	  [str appendString: @"\"></author>\n"];