diff --git a/src/dialogs.py b/src/dialogs.py
index 18d6d7dcf..141af53b2 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -508,6 +508,11 @@ class ConfirmationDialog(HigDialog):
 	def __init__(self, pritext, sectext=''):
 		HigDialog.__init__(self, None, 
 			gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext)
+		
+		self.set_default_response(gtk.RESPONSE_OK)
+		
+		ok_button = self.action_area.get_children()[0] # right to left
+		ok_button.grab_focus()
 			
 class WarningDialog(HigDialog):
 	def __init__(self, pritext, sectext=''):
diff --git a/src/gajim.py b/src/gajim.py
index eaad66599..327e53b10 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1461,9 +1461,9 @@ if __name__ == '__main__':
 		except:
 			pass
 	
-	# Migrate old logs if user wnats that
+	# Migrate old logs if user wants that
 	if NO_DB:
-		dialog = dialogs.ConfirmationDialog(_('It is the first time you rin Gajim since the way logs are save changed. You can ask Gajim to migrate your old logs by pressing Ok button. This can take some minutes.'), _('Do you want to migrate your logs?'))
+		dialog = dialogs.ConfirmationDialog(_('Do you want to migrate your logs?'), _('It is the first time you run Gajim since the way logs are stored has changed. Gajim can migrate your logs at this state. Migrate?'))
 		if dialog.get_response() == gtk.RESPONSE_OK:
 			from common import migrate_logs_to_dot9_db
 			migrate_logs_to_dot9_db.migrate()