diff --git a/src/dialogs.py b/src/dialogs.py
index 000b622a9..dbdb72a94 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -346,10 +346,9 @@ class ChangeActivityDialog:
 		self.checkbutton = self.xml.get_widget('enable_checkbutton')
 		self.notebook = self.xml.get_widget('notebook')
 		self.entry = self.xml.get_widget('description_entry')
-		self.ok_button = self.xml.get_widget('ok_button')
 
-		self.activity = None
-		self.subactivity = None
+		self.activity = 'working'
+		self.subactivity = 'other'
 
 		rbtns = {}
 		group = None
@@ -388,6 +387,8 @@ class ChangeActivityDialog:
 				[category, 'other'])
 			vbox.pack_start(rbtns[act], False, False, 0)
 
+		rbtns['working_other'].set_active(True)
+
 		con = gajim.connections[account]
 
 		if 'activity' in con.activity \
@@ -419,19 +420,11 @@ class ChangeActivityDialog:
 		self.notebook.set_sensitive(widget.get_active())
 		self.entry.set_sensitive(widget.get_active())
 
-		if widget.get_active() and (self.activity is None \
-		or self.subactivity is None):
-			self.ok_button.set_sensitive(False)
-		else:
-			self.ok_button.set_sensitive(True)
-
 	def on_rbtn_toggled(self, widget, data):
 		if widget.get_active():
 			self.activity = data[0]
 			self.subactivity = data[1]
 
-		self.ok_button.set_sensitive(True)
-
 	def on_ok_button_clicked(self, widget):
 		'''
 		Return activity and messsage (None if no activity selected)