diff --git a/src/config.py b/src/config.py
index 488457406230df8c164a0a62d3b14deb5cd51f68..a4310e95d4bc4e1b567bb562714e3bc81ef3b0a1 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2411,7 +2411,7 @@ def on_add_bookmark_button_clicked(self,widget):
 		(model, iter) = self.selection.get_selected()
 		if not iter:
 			#Nothing selected, do nothing
-			pass
+			return
 			#FIXME: ErrorDialog
 
 		parent = model.iter_parent(iter)
@@ -2435,7 +2435,7 @@ def on_remove_bookmark_button_clicked(self, widget):
 		if not iter:
 			#Nothing selected
 			return
-		elif not model.iter_parent(iter):
+		if not model.iter_parent(iter):
 			#Don't remove account iters
 			return
 
@@ -2493,4 +2493,4 @@ def clear_fields(self):
 		self.server_entry.set_text('')
 		self.pass_entry.set_text('')
 		self.nick_entry.set_text('')
-
+		self.autojoin_checkbutton.set_active(False)