--- fakemail.c.orig	Fri Apr 11 12:51:17 1997
+++ lib-src/fakemail.c	Fri Apr 11 12:55:27 1997
@@ -308,6 +308,7 @@
 make_file_preface (void)
 {
   char *the_string, *temp;
+  struct passwd *tmppwd;
   long idiotic_interface;
   long prefix_length;
   long user_length;
@@ -320,10 +321,10 @@
   /* the_date has an unwanted newline at the end */
   date_length = strlen (the_date) - 1;
   the_date[date_length] = '\0';
-  temp = cuserid ((char *) NULL);
-  user_length = strlen (temp);
+  tmppwd = getpwuid(geteuid());
+  user_length = strlen (tmppwd->pw_name);
   the_user = alloc_string ((size_t) (user_length + 1));
-  strcpy (the_user, temp);
+  strcpy (tmppwd->pw_name, temp);
   the_string = alloc_string ((size_t) (3 + prefix_length +
 				       user_length +
 				       date_length));
