diff --git a/src/config.py b/src/config.py
index b5f39019f..a9cd8c3f6 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1485,8 +1485,8 @@ class AccountsWindow:
 		self.accounts_treeview.set_model(model)
 		# column
 		renderer = gtk.CellRendererText()
-		self.accounts_treeview.insert_column_with_attributes(-1,
-					_('Name'), renderer, text = 0)
+		self.accounts_treeview.insert_column_with_attributes(-1, _('Name'),
+			renderer, text=0)
 
 		self.current_account = None
 		# When we fill info, we don't want to handle the changed signals
@@ -1503,7 +1503,8 @@ class AccountsWindow:
 		st = gajim.config.get('mergeaccounts')
 		checkbutton = self.xml.get_object('merge_checkbutton')
 		checkbutton.set_active(st)
-		# prevent roster redraws by connecting the signal after button state is set
+		# prevent roster redraws by connecting the signal after button state is
+		# set
 		checkbutton.connect('toggled', self.on_merge_checkbutton_toggled)
 
 		self.avahi_available = True
@@ -1625,8 +1626,12 @@ class AccountsWindow:
 
 		self.check_resend_relog()
 
-		self.remove_button.set_sensitive(True)
-		self.rename_button.set_sensitive(True)
+		if account:
+			self.remove_button.set_sensitive(True)
+			self.rename_button.set_sensitive(True)
+		else:
+			self.remove_button.set_sensitive(False)
+			self.rename_button.set_sensitive(False)
 		if iter_:
 			self.current_account = account
 			if account == gajim.ZEROCONF_ACC_NAME: