diff --git a/setup/tools/clisetup/dbconfig.func.php b/setup/tools/clisetup/dbconfig.func.php
index 57444a0e..52e74512 100644
--- a/setup/tools/clisetup/dbconfig.func.php
+++ b/setup/tools/clisetup/dbconfig.func.php
@@ -83,13 +83,16 @@ function dbconfig()
             {
                 if ($inp['idx'] >= 0 && $inp['idx'] <= (3 + $nCharDBs))
                 {
-                    $curFields = $dbFields;
+                    $curFields = $inp['idx'] ? $dbFields : array_splice($dbFields, 0, 4);
 
                     if ($inp['idx'] == 3 + $nCharDBs)       // add new realmDB
                         $curFields['realmId'] = ['Realm Id',  false, '/[1-9][0-9]*/'];
 
                     if (CLISetup::readInput($curFields))
                     {
+                        if ($inp['idx'] == 0 && $curFields)
+                            $curFields['prefix'] = 'aowow_';
+
                         // auth, world or aowow
                         if ($inp['idx'] < 3)
                             $AoWoWconf[$databases[$inp['idx']]] = $curFields ?: array_combine(array_keys($dbFields), ['', '', '', '', '']);