diff --git a/src/gui/DatabaseRegistrationDialog.cpp b/src/gui/DatabaseRegistrationDialog.cpp
index 95e8a51d..f2219187 100644
--- a/src/gui/DatabaseRegistrationDialog.cpp
+++ b/src/gui/DatabaseRegistrationDialog.cpp
@@ -336,7 +336,7 @@ void DatabaseRegistrationDialog::setControlsProperties()
     int wh = text_ctrl_dbpath->GetMinHeight();
     button_browse->SetSize(wh, wh);
 
-    choice_authentication->SetSelection(0);
+    choice_authentication->SetSelection(DatabaseAuthenticationMode::UseSavedEncryptedPwd);
     combobox_charset->SetStringSelection("NONE");
     if (createM)
     {
diff --git a/src/metadata/database.cpp b/src/metadata/database.cpp
index a382f676..dbfd5a55 100644
--- a/src/metadata/database.cpp
+++ b/src/metadata/database.cpp
@@ -226,7 +226,7 @@ void DatabaseInfo::reloadIfNecessary(const IBPP::Database database)
 
 // DatabaseAuthenticationMode class
 DatabaseAuthenticationMode::DatabaseAuthenticationMode()
-    : modeM(UseSavedPassword)
+    : modeM(UseSavedEncryptedPwd)
 {
 }