diff --git a/src/config.py b/src/config.py
index cb5be0723..4e4c49161 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1417,7 +1417,6 @@ class AccountsWindow:
 			self.current_account = account
 			if account == gajim.ZEROCONF_ACC_NAME:
 				self.remove_button.set_sensitive(False)
-				self.rename_button.set_sensitive(False)
 		self.init_account()
 		self.update_proxy_list()
 
@@ -1752,6 +1751,8 @@ class AccountsWindow:
 			gajim.config.del_per('accounts', old_name)
 			if self.current_account == old_name:
 				self.current_account = new_name
+			if old_name == gajim.ZEROCONF_ACC_NAME:
+				gajim.ZEROCONF_ACC_NAME = new_name
 			# refresh roster
 			gajim.interface.roster.setup_and_draw_roster()
 			self.init_accounts()
diff --git a/src/gajim.py b/src/gajim.py
index bc0a18214..8ac19f827 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -3224,6 +3224,10 @@ class Interface:
 		if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'):
 			gtkgui_helpers.possibly_set_gajim_as_xmpp_handler()
 
+		for account in gajim.config.get_per('accounts'):
+			if gajim.config.get_per('accounts', account, 'is_zeroconf'):
+				gajim.ZEROCONF_ACC_NAME = account
+				break
 		# Is gnome configured to activate row on single click ?
 		try:
 			import gconf