diff --git a/src/sao.js b/src/sao.js
index cff5f413ff..4cedb76dd2 100644
--- a/src/sao.js
+++ b/src/sao.js
@@ -532,7 +532,8 @@ var Sao = {};
                 var currently_focused = jQuery(document.activeElement);
                 var has_focus = currently_focused.closest(this.el) > 0;
                 if (!has_focus) {
-                    jQuery(this).find(':input:visible:first').focus();
+                    jQuery(this).find(':input:visible:not([readonly]):first')
+                        .focus();
                 }
             });
         },
diff --git a/src/session.js b/src/session.js
index 4366da005b..c3ea4470c5 100644
--- a/src/session.js
+++ b/src/session.js
@@ -130,7 +130,7 @@
         var dialog = Sao.Session.login_dialog();
 
         var empty_field = function() {
-            return dialog.modal.find('input,select').filter(':visible')
+            return dialog.modal.find('input,select').filter(':visible:not([readonly])')
                 .filter(function() {
                     return !jQuery(this).val();
                 });
@@ -188,7 +188,6 @@
             el.prop('readonly', databases.length == 1);
             el.show();
             el.val(database || '');
-            empty_field().first().focus();
         });
         return dfd.promise();
     };