diff --git a/FFXIVClassic Lobby Server/ConfigConstants.cs b/FFXIVClassic Lobby Server/ConfigConstants.cs
index 501570e1..4f3b4d3d 100644
--- a/FFXIVClassic Lobby Server/ConfigConstants.cs	
+++ b/FFXIVClassic Lobby Server/ConfigConstants.cs	
@@ -64,7 +64,22 @@ namespace FFXIVClassic_Lobby_Server
                     if (UInt16.TryParse(val, out port) && (legit = true))
                         OPTIONS_PORT = val;
                 }
-
+                else if (arg == "user" && (legit = true))
+                {
+                    DATABASE_USERNAME = val;
+                }
+                else if (arg == "p" && (legit = true))
+                {
+                    DATABASE_PASSWORD = val;
+                }
+                else if (arg == "db" && (legit = true))
+                {
+                    DATABASE_NAME = val;
+                }
+                else if (arg == "host" && (legit = true))
+                {
+                    DATABASE_HOST = val;
+                }
                 if (!legit)
                 {
                     Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
diff --git a/FFXIVClassic Map Server/ConfigConstants.cs b/FFXIVClassic Map Server/ConfigConstants.cs
index 97b9aa47..908914cb 100644
--- a/FFXIVClassic Map Server/ConfigConstants.cs	
+++ b/FFXIVClassic Map Server/ConfigConstants.cs	
@@ -70,7 +70,22 @@ namespace FFXIVClassic_Map_Server
                     if (UInt16.TryParse(val, out port) && (legit = true))
                         OPTIONS_PORT = val;
                 }
-
+                else if (arg == "user" && (legit = true))
+                {
+                    DATABASE_USERNAME = val;
+                }
+                else if (arg == "p" && (legit = true))
+                {
+                    DATABASE_PASSWORD = val;
+                }
+                else if (arg == "db" && (legit = true))
+                {
+                    DATABASE_NAME = val;
+                }
+                else if (arg == "host" && (legit = true))
+                {
+                    DATABASE_HOST = val;
+                }
                 if (!legit)
                 {
                     Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs
index 2e309df7..c89af9a7 100644
--- a/FFXIVClassic Map Server/WorldManager.cs	
+++ b/FFXIVClassic Map Server/WorldManager.cs	
@@ -53,7 +53,7 @@ namespace FFXIVClassic_Map_Server
             zoneList = new Dictionary<uint, Zone>();
             int count1 = 0;
             int count2 = 0;
-
+            
             using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
             {
                 try
diff --git a/FFXIVClassic World Server/ConfigConstants.cs b/FFXIVClassic World Server/ConfigConstants.cs
index 021f4910..b291ea0b 100644
--- a/FFXIVClassic World Server/ConfigConstants.cs	
+++ b/FFXIVClassic World Server/ConfigConstants.cs	
@@ -69,7 +69,22 @@ namespace FFXIVClassic_World_Server
                     if (UInt16.TryParse(val, out port) && (legit = true))
                         OPTIONS_PORT = val;
                 }
-
+                else if (arg == "user" && (legit = true))
+                {
+                    DATABASE_USERNAME = val;
+                }
+                else if (arg == "p" && (legit = true))
+                {
+                    DATABASE_PASSWORD = val;
+                }
+                else if (arg == "db" && (legit = true))
+                {
+                    DATABASE_NAME = val;
+                }
+                else if (arg == "host" && (legit = true))
+                {
+                    DATABASE_HOST = val;
+                }
                 if (!legit)
                 {
                     Program.Log.Error("Invalid parameter <{0}> for argument: <--{1}> or argument doesnt exist!", val, arg);
diff --git a/sql/gamedata_actor_class.sql b/sql/gamedata_actor_class.sql
index 30667197..9a8c0b20 100644
--- a/sql/gamedata_actor_class.sql
+++ b/sql/gamedata_actor_class.sql
@@ -6,18 +6,18 @@ Target Host: localhost
 Target Database: ffxiv_server
 Date: 1/11/2017 10:01:07 PM
 */
-
+SET autocommit=0;
 SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 -- Table structure for gamedata_actor_class
 -- ----------------------------
-CREATE TABLE `gamedata_actor_class` (
-  `id` int(10) unsigned NOT NULL,
-  `classPath` varchar(64) NOT NULL,
-  `displayNameId` int(10) unsigned NOT NULL DEFAULT '4294967295',
-  `propertyFlags` int(10) unsigned NOT NULL DEFAULT '0',
-  `eventConditions` longtext,
-  PRIMARY KEY (`id`)
+CREATE TABLE `gamedata_actor_class` (
+  `id` int(10) unsigned NOT NULL,
+  `classPath` varchar(64) NOT NULL,
+  `displayNameId` int(10) unsigned NOT NULL DEFAULT '4294967295',
+  `propertyFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `eventConditions` longtext,
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- ----------------------------
@@ -8007,3 +8007,5 @@ INSERT INTO `gamedata_actor_class` VALUES ('9220405', '', '2', '0', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', '0', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', '0', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', '0', null);
+
+COMMIT;
\ No newline at end of file