diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index e89cad77e..1e21d4098 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-28  Dan Williams  <dcbw@redhat.com>
+
+	* auth-dialog/main.c
+		- (get_secrets): don't gtk_widget_show_all() because that exposes
+			widgets that were supposed to be hidden
+		- (main): don't segfault on missing passwords (like hitting Cancel)
+
 2008-08-26  Dan Williams  <dcbw@redhat.com>
 
 	* auth-dialog/main.c
diff --git a/vpn-daemons/pptp/auth-dialog/main.c b/vpn-daemons/pptp/auth-dialog/main.c
index cfbbf365c..5cd1062c4 100644
--- a/vpn-daemons/pptp/auth-dialog/main.c
+++ b/vpn-daemons/pptp/auth-dialog/main.c
@@ -164,7 +164,7 @@ get_secrets (const char *vpn_uuid,
 		*password = NULL;
 	}
 
-	gtk_widget_show_all (GTK_WIDGET (dialog));
+	gtk_widget_show (GTK_WIDGET (dialog));
 
 	if (gnome_two_password_dialog_run_and_block (dialog)) {
 		*password = gnome_two_password_dialog_get_password (dialog);
@@ -238,8 +238,10 @@ main (int argc, char *argv[])
 	printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password);
 	printf ("\n\n");
 
-	memset (password, 0, strlen (password));
-	g_free (password);
+	if (password) {
+		memset (password, 0, strlen (password));
+		g_free (password);
+	}
 	exit_status = 0;
 
 	/* for good measure, flush stdout since Kansas is going Bye-Bye */