diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 4c99b68347553519f8ffb4fbbfc6745be0045302..a33e8a530f22654ce7690afaa7fdca633886151b 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -149,12 +149,12 @@ renewals_enabled = false
 title_level_holds_mode = "disabled"
 
 ; This section allows you to determine how the users will authenticate.
-; You can use an LDAP directory, the local ILS, the VuFind database (DB),
+; You can use an LDAP directory, the local ILS, the VuFind database (Database),
 ; Shibboleth, SIP2 or some combination of these (via the MultiAuth option).
 [Authentication]
 ;method          = LDAP
 ;method         = ILS
-method         = DB
+method         = Database
 ;method         = Shibboleth
 ;method         = SIP2
 ;method         = MultiAuth
diff --git a/module/VuFind/src/VuFind/Config/Upgrade.php b/module/VuFind/src/VuFind/Config/Upgrade.php
index 68d33a61123f055c53461d948b341f6dad6bf996..af2abde59d038724530f846024ae114e531fcdd2 100644
--- a/module/VuFind/src/VuFind/Config/Upgrade.php
+++ b/module/VuFind/src/VuFind/Config/Upgrade.php
@@ -374,6 +374,14 @@ class Upgrade
         $this->checkTheme('theme', 'blueprint');
         $this->checkTheme('mobile_theme', 'jquerymobile');
 
+        // Translate legacy auth settings:
+        if (strtolower($newConfig['Authentication']['method']) == 'db') {
+            $newConfig['Authentication']['method'] = 'Database';
+        }
+        if (strtolower($newConfig['Authentication']['method']) == 'sip') {
+            $newConfig['Authentication']['method'] = 'SIP2';
+        }
+
         // Translate legacy session settings:
         $newConfig['Session']['type'] = ucwords(
             str_replace('session', '', strtolower($newConfig['Session']['type']))