diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 29936becf..bbd1134ac 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -449,7 +449,7 @@ class add_contact_window:
 		if jid:
 			self.xml.get_widget('jid_entry').set_text(jid)
 			jid_splited = jid.split('@')
-			self.xml.get_widget('entry_login').set_text(jid_splited[0])
+			self.xml.get_widget('login_entry').set_text(jid_splited[0])
 			if jid_splited[1] in jid_agents:
 				agent_combobox.set_active(jid_agents.index(jid_splited[1])+1)
 		self.xml.signal_autoconnect(self)
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 8356bf7ff..4f3e7e2cc 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -1341,7 +1341,7 @@ class roster_window:
 	def on_remove_agent(self, widget, jid, account):
 		"""When an agent is requested to log in or off"""
 		window = confirm_dialog(_("Are you sure you want to remove the agent %s from your roster ?") % jid)
-		if window.wait() == gtk.RESPONSE_YES:
+		if window.get_response() == gtk.RESPONSE_YES:
 			self.plugin.send('UNSUB_AGENT', account, jid)
 			for u in self.contacts[account][jid]:
 				self.remove_user(u, account)
@@ -1525,7 +1525,7 @@ class roster_window:
 			pseudo = jid
 		self.plugin.send('SUB', account, (jid, txt))
 		if not self.contacts[account].has_key(jid):
-			user1 = user(jid, pseudo, ['general'], 'requested', \
+			user1 = User(jid, pseudo, ['general'], 'requested', \
 				'requested', 'none', 'subscribe', '', 0, '')
 			self.contacts[account][jid] = [user1]
 			self.add_user_to_roster(jid, account)
@@ -1569,7 +1569,7 @@ class roster_window:
 	def on_req_usub(self, widget, user, account):
 		"""Remove a user"""
 		window = confirm_dialog(_("Are you sure you want to remove %s (%s) from your roster ?") % (user.name, user.jid))
-		if window.wait() == gtk.RESPONSE_YES:
+		if window.get_response() == gtk.RESPONSE_YES:
 			self.plugin.send('UNSUB', account, user.jid)
 			for u in self.contacts[account][user.jid]:
 				self.remove_user(u, account)