diff --git a/ChangeLog b/ChangeLog
index 45a3355686..c6fd898473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-20  Christopher Aillon  <caillon@redhat.com>
+
+	* gnome/applet/other-network-dialog.c:
+	The "Create New Network" and "Connect to Other Network"
+	dialogs share alot of code, but shouldn't share a window
+	title.  Give them different ones.
+
+	* gnome/applet/wireless-applet.glade:
+	* vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:
+	Some more minor UI tweaks.
+
 2005-08-19  Christopher Aillon  <caillon@redhat.com>
 
 	* gnome/applet/other-network-dialog.c:
diff --git a/gnome/applet/other-network-dialog.c b/gnome/applet/other-network-dialog.c
index 6283eee8ef..2967514774 100644
--- a/gnome/applet/other-network-dialog.c
+++ b/gnome/applet/other-network-dialog.c
@@ -234,12 +234,16 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple
 			_("By default, the ESSID is set to your computer's name,"),
 			hostname,
 			_(", with no encryption enabled."));
+
+		gtk_window_set_title (GTK_WINDOW(dialog), _("Create New Wireless Network"));
 	}
 	else
 	{
 		label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
 			_("Custom wireless network"),
 			_("Enter the ESSID of the wireless network to which you wish to connect."));
+
+		gtk_window_set_title (GTK_WINDOW(dialog), _("Connect to Other Wireless Network"));
 	}
 	gtk_label_set_markup (GTK_LABEL (glade_xml_get_widget (xml, "essid_label")), label);
 	g_free (label);
diff --git a/gnome/applet/wireless-applet.glade b/gnome/applet/wireless-applet.glade
index b90ae9aca5..b5bf909970 100644
--- a/gnome/applet/wireless-applet.glade
+++ b/gnome/applet/wireless-applet.glade
@@ -126,7 +126,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		<widget class="GtkCheckButton" id="trust_checkbutton">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Always Trust this Wireless Network</property>
+		  <property name="label" translatable="yes">_Always Trust this Wireless Network</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -191,7 +191,8 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_OK</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -268,7 +269,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		<widget class="GtkCheckButton" id="dont_remind_checkbox">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Don't remind me again</property>
+		  <property name="label" translatable="yes">_Don't remind me again</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -586,7 +587,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">_Passphrase:</property>
 				  <property name="mnemonic_widget">passphrase_entry</property>
-				  <property name="use_underline">False</property>
+				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
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 1e94092d80..94d1faa23d 100644
--- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
+++ b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c
@@ -463,9 +463,9 @@ gnome_two_password_dialog_new (const char	*dialog_title,
 	gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox);
 
 	password_dialog->details->remember_session_button =
-		gtk_check_button_new_with_label (_("Remember password for this session"));
+		gtk_check_button_new_with_mnemonic (_("_Remember password for this session"));
 	password_dialog->details->remember_forever_button =
-		gtk_check_button_new_with_label (_("Save password in keyring"));
+		gtk_check_button_new_with_mnemonic (_("_Save password in keyring"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, 
 			    TRUE, TRUE, 6);