--- /home/dhollis/cvs/asterisk/apps/app_voicemail.c	2003-12-22 15:43:31.000000000 -0500
+++ app_voicemail.c	2004-01-07 14:22:13.000000000 -0500
@@ -288,11 +288,8 @@
 			strcpy(retval->context, "default");
 		}
 
-		if (*retval->context) {
-			sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='%s' AND mailbox='%s'", context, mailbox);
-		} else {
-			sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='default' AND mailbox='%s'", mailbox);
-		}
+		sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='%s' AND mailbox='%s'", retval->context, mailbox);
+
 /*	fprintf(stderr,"postgres find_user: query = %s\n",query); */
 		ast_mutex_lock(&postgreslock);
 		PGSQLres=PQexec(dbhandler,query);