diff --git a/ChangeLog b/ChangeLog
index 18cfb53c71..3484d4998c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-04  Ryan Lortie  <desrt@desrt.ca>
+
+	* gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of
+	  the WirelessNetwork structure using the proper function instead of
+	  just casting it directly to (const char *) (gnome.org #336991)
+
 2006-05-03  Robert Love  <rml@novell.com>
 
 	* src/backends/NetworkManagerSuSE.c: Respect the variable
diff --git a/gnome/applet/passphrase-dialog.c b/gnome/applet/passphrase-dialog.c
index efb1b88882..70aa12f40e 100644
--- a/gnome/applet/passphrase-dialog.c
+++ b/gnome/applet/passphrase-dialog.c
@@ -53,6 +53,7 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
 	GladeXML *	xml;
 	WirelessSecurityManager * wsm;
 	GtkComboBox *	security_combo;
+	WirelessNetwork *net;
 
 	g_return_if_fail (dialog != NULL);
 	xml = get_dialog_xml (GTK_WIDGET (dialog));
@@ -60,7 +61,8 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
 	wsm = (WirelessSecurityManager *) g_object_get_data (G_OBJECT (dialog), "wireless-security-manager");
 	g_return_if_fail (wsm != NULL);
 
-	if ((ssid = (const char *) g_object_get_data (G_OBJECT (dialog), "network")))
+	if ((net = g_object_get_data (G_OBJECT (dialog), "network")) &&
+	    (ssid = wireless_network_get_essid (net)))
 	{
 		/* Validate the wireless security choices */
 		security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));