--- app_voicemail.c.orig	2003-12-04 16:29:02.000000000 -0600
+++ app_voicemail.c	2003-12-04 16:37:02.000000000 -0600
@@ -266,12 +266,13 @@
 		if (context) {
 			strcpy(retval->context, context);
 		}
-
-		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 mailbox='%s'", mailbox);
+		else
+		{
+			strcpy(retval->context, "default");
 		}
+
+		sprintf(query, "SELECT password,fullname,email,pager,options FROM voicemail WHERE context='%s' AND mailbox='%s'", context, mailbox);
+
 /*	fprintf(stderr,"postgres find_user: query = %s\n",query); */
 		ast_mutex_lock(&postgreslock);
 		PGSQLres=PQexec(dbhandler,query);