diff --git a/admin/index.php b/admin/index.php
index 4f934ce5f39..1ae53ec18bf 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -207,6 +207,7 @@
                                                    'enrol' => 'manual',
                                                    'enrol_plugins_enabled' => 'manual',
                                                    'guestloginbutton' => 1,
+                                                   'registerauth' => 'email',
                                                    'style' => 'default',
                                                    'template' => 'default',
                                                    'theme' => 'standardwhite',
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index dbf48477422..595a1f0ac7a 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -133,6 +133,11 @@ function xmldb_main_upgrade($oldversion=0) {
 
     // Move the auth plugin settings into the config_plugin table
     if ($oldversion < 2007010300) {
+        if ($CFG->auth == 'email') {
+            set_config('registerauth', 'email');
+        } else {
+            set_config('registerauth', '');
+        }
         $authplugins = get_list_of_plugins('auth');
         foreach ($CFG as $k => $v) {
             if (strpos($k, 'auth_') !== 0) {