--- tmp/asterisk/apps/app_voicemail.c	Mon Nov 17 07:20:09 2003
+++ asterisk/apps/app_voicemail2.c	Tue Nov 18 11:45:01 2003
@@ -250,7 +248,7 @@
 	if (retval) {
 		*retval->mailbox='\0';
 		*retval->context='\0';
-		*retval->password='\0';
+		strcpy(retval->password, "NULL");
 		*retval->fullname='\0';
 		*retval->email='\0';
 		*retval->pager='\0';
@@ -296,7 +294,8 @@
 			}
 			for (i=0; i<numFields; i++) {
 				fname = PQfname(PGSQLres,i);
-				if (!strcmp(fname, "password")) {
+/*	fprintf(stderr,"postgres find_user: Field %d is %s\n", i, fname);  */
+				if (!strcmp(fname, "password") && !PQgetisnull(PGSQLres,0,i)) {
 					strncpy(retval->password, PQgetvalue(PGSQLres,0,i),sizeof(retval->password) - 1);
 				} else if (!strcmp(fname, "fullname")) {
 					strncpy(retval->fullname, PQgetvalue(PGSQLres,0,i),sizeof(retval->fullname) - 1);