diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 9aea595d5..1929fc7d6 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -557,7 +557,7 @@ class join_groupchat_window:
 		"""close window"""
 		del self.plugin.windows['join_gc'] # remove us from open windows
 
-	def on_close_button_clicked(self, widget):
+	def on_cancel_button_clicked(self, widget):
 		"""When Cancel button is clicked"""
 		widget.get_toplevel().destroy()
 
@@ -566,7 +566,7 @@ class join_groupchat_window:
 		nickname = self.xml.get_widget('nickname_entry').get_text()
 		room = self.xml.get_widget('room_entry').get_text()
 		server = self.xml.get_widget('server_entry').get_text()
-		password = self.xml.get_widget('passwrd_entry').get_text()
+		password = self.xml.get_widget('password_entry').get_text()
 		jid = '%s@%s' % (room, server)
 		self.plugin.windows[self.account]['gc'][jid] = gtkgui.gc(jid, nickname,\
 			self.plugin, self.account)
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 0723a6931..863411421 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -7314,7 +7314,7 @@ Custom</property>
 	  <property name="spacing">20</property>
 
 	  <child>
-	    <widget class="GtkButton" id="cancel_utton">
+	    <widget class="GtkButton" id="cancel_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -7322,7 +7322,7 @@ Custom</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_cancel_utton_clicked" last_modification_time="Wed, 02 Mar 2005 12:19:37 GMT"/>
+	      <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Fri, 04 Mar 2005 13:40:16 GMT"/>
 	    </widget>
 	  </child>