diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index a6115ec12..f2c40b9f4 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -24,7 +24,7 @@ template(name="userFormsLayout")
     section.auth-dialog
       +Template.dynamic(template=content)
       if currentSetting.displayAuthenticationMethod
-        +connectionMethod
+        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
       div.at-form-lang
         select.select-lang.js-userform-set-language
           each languages
diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade
index ac4c8c642..d191929f8 100644
--- a/client/components/settings/connectionMethod.jade
+++ b/client/components/settings/connectionMethod.jade
@@ -2,5 +2,8 @@ template(name='connectionMethod')
   div.at-form-authentication
     label {{_ 'authentication-method'}}
     select.select-authentication
-        each authentications
-            option(value="{{value}}") {{_ value}}
+      each authentications
+        if isSelected value
+          option(value="{{value}}" selected) {{_ value}}
+        else
+          option(value="{{value}}") {{_ value}}
\ No newline at end of file
diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js
index 9fe8f382d..db9da25f8 100644
--- a/client/components/settings/connectionMethod.js
+++ b/client/components/settings/connectionMethod.js
@@ -31,4 +31,7 @@ Template.connectionMethod.helpers({
   authentications() {
     return Template.instance().authenticationMethods.get();
   },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
 });