diff --git a/src/common/gajim.py b/src/common/gajim.py
index 8ff1a6952..4d3741d4f 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -189,3 +189,11 @@ def get_jid_from_account(account_name):
 	hostname = config.get_per('accounts', account_name, 'hostname')
 	jid = name + '@' + hostname
 	return jid
+
+def get_hostname_from_account(account_name):
+	'''returns hostname (if custom hostname is used, that is returned)'''
+	hostname = config.get_per('accounts', account_name, 'custom_host')
+	if hostname == '':
+		hostname = config.get_per('accounts', account_name, 'hostname')
+	return hostname
+	
diff --git a/src/config.py b/src/config.py
index 737ade9c0..aa903b26a 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1694,8 +1694,7 @@ class AccountsWindow:
 		model.clear()
 		for account in gajim.connections:
 			iter = model.append()
-			model.set(iter, 0, account, 1, gajim.config.get_per('accounts',
-				account, 'hostname'))
+			model.set(iter, 0, account, 1, gajim.get_hostname_from_account(account))
 
 	def on_accounts_treeview_cursor_changed(self, widget):
 		'''Activate delete and modify buttons when a row is selected'''
@@ -2076,8 +2075,7 @@ _('Without a connection, you can not browse available services')).get_response()
 		self.address_comboboxentry.set_model(liststore)
 		self.address_comboboxentry.set_text_column(0)
 		self.latest_addresses = gajim.config.get('latest_disco_addresses').split()
-		server_address = gajim.config.get_per('accounts', self.account,
-			'hostname')
+		server_address = gajim.get_hostname_from_account(self.account)
 		if server_address in self.latest_addresses:
 			self.latest_addresses.remove(server_address)
 		self.latest_addresses.insert(0, server_address)