diff --git a/src/config.py b/src/config.py
index c5a73ba60446e19e5bc7f60d9517e69fbe2eee00..b07d099f1e18f3cb2474f3ecbe00bc920ef1697c 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2616,8 +2616,11 @@ class AccountCreationWizardWindow:
 
 		# Connect events from comboboxentry.child
 		server_comboboxentry = self.xml.get_widget('server_comboboxentry')
-		server_comboboxentry.child.connect('key_press_event',
+		entry = server_comboboxentry.child
+		entry.connect('key_press_event',
 			self.on_server_comboboxentry_key_press_event)
+		completion = gtk.EntryCompletion()
+		entry.set_completion(completion)
 
 		# parse servers.xml
 		servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml')
@@ -2626,6 +2629,9 @@ class AccountCreationWizardWindow:
 		for server in servers:
 			servers_model.append((str(server[0]), int(server[1])))
 
+		completion.set_model(servers_model)
+		completion.set_text_column(0)
+
 		# Put servers into comboboxentries
 		server_comboboxentry.set_model(servers_model)
 		server_comboboxentry.set_text_column(0)