diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index 2fc2ed0a99..09d8dd9b2d 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-04  Robert Love  <rml@novell.com>
+
+	* auth-dialog/gnome-two-password-dialog.c: Embarrassing bug!  Make sure
+	  we g_free() these things in the right order.  Fix c/o JPR. (Novell
+	  bug #121884).
+
 2005-10-27  Christopher Aillon  <caillon@redhat.com>
 
 	* src/nm-vpn-service.c: Only signal the bus that state
diff --git a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
index 94d1faa23d..72c10935da 100644
--- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
+++ b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
@@ -161,9 +161,8 @@ gnome_two_password_dialog_finalize (GObject *object)
 	g_object_unref (password_dialog->details->password_entry_secondary);
 
 	g_free (password_dialog->details->remember_label_text);
-	g_free (password_dialog->details);
-
 	g_free (password_dialog->details->secondary_password_label);
+	g_free (password_dialog->details);
 
 	if (G_OBJECT_CLASS (parent_class)->finalize != NULL)
 		(* G_OBJECT_CLASS (parent_class)->finalize) (object);