*** gui.c.orig	Mon Jul 22 22:45:11 1996
--- gui.c	Mon Jul 22 22:38:28 1996
***************
*** 4586,4590 ****
          char *default_author_email = get_pref_string(eDEFAULT_AUTHOR_EMAIL);
        
!         if(!default_author_name) {
  	    if (!pw || !pw->pw_gecos) {
  		default_author_name = strdup("Unknown");
--- 4586,4590 ----
          char *default_author_email = get_pref_string(eDEFAULT_AUTHOR_EMAIL);
        
!         if(!default_author_name || !*default_author_name) {
  	    if (!pw || !pw->pw_gecos) {
  		default_author_name = strdup("Unknown");
***************
*** 4600,4604 ****
  		}
  	}
!         if(!default_author_email) {
  	    if (!pw || !pw->pw_name) {
  		default_author_email =
--- 4600,4604 ----
  		}
  	}
!         if(!default_author_email || !*default_author_email) {
  	    if (!pw || !pw->pw_name) {
  		default_author_email =
***************
*** 4612,4615 ****
--- 4612,4626 ----
  	    }
          }    
+ 
+ 	/* Check again just to make absolutely sure something is there */
+ 	if (!default_author_name || !*default_author_name) {
+ 		default_author_name = strdup("Unknown");
+ 	}
+         if(!default_author_email || !*default_author_email) {
+ 		default_author_email =
+ 			(char *) malloc(strlen("UNKNOWN")+strlen(machine)+2);
+ 		sprintf(default_author_email,"UNKNOWN@%s",machine);
+ 	}
+ 
          set_pref(eDEFAULT_AUTHOR_NAME, (void *)default_author_name);
          set_pref(eDEFAULT_AUTHOR_EMAIL, (void *)default_author_email);