diff --git a/world/main.cpp b/world/main.cpp
index 2b92bde98..4d5511f7c 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -143,11 +143,11 @@ void LoadDatabaseConnections()
 	 */
 	if (!Config->ContentDbHost.empty()) {
 		if (!content_db.Connect(
-			!Config->ContentDbHost.empty() ? Config->ContentDbHost.c_str() : Config->DatabaseHost.c_str(),
-			!Config->ContentDbUsername.empty() ? Config->ContentDbUsername.c_str() : Config->DatabaseUsername.c_str(),
-			!Config->ContentDbPassword.empty() ? Config->ContentDbPassword.c_str() : Config->DatabasePassword.c_str(),
-			!Config->ContentDbName.empty() ? Config->ContentDbName.c_str() : Config->DatabaseDB.c_str(),
-			Config->ContentDbPort != 0 ? Config->ContentDbPort : Config->DatabasePort
+			Config->ContentDbHost.c_str() ,
+			Config->ContentDbUsername.c_str(),
+			Config->ContentDbPassword.c_str(),
+			Config->ContentDbName.c_str(),
+			Config->ContentDbPort
 		)) {
 			LogError("Cannot continue without a content database connection");
 			std::exit(1);
diff --git a/zone/main.cpp b/zone/main.cpp
index 989962554..96dbac95d 100644
--- a/zone/main.cpp
+++ b/zone/main.cpp
@@ -242,11 +242,11 @@ int main(int argc, char** argv) {
 	 */
 	if (!Config->ContentDbHost.empty()) {
 		if (!content_db.Connect(
-			!Config->ContentDbHost.empty() ? Config->ContentDbHost.c_str() : Config->DatabaseHost.c_str(),
-			!Config->ContentDbUsername.empty() ? Config->ContentDbUsername.c_str() : Config->DatabaseUsername.c_str(),
-			!Config->ContentDbPassword.empty() ? Config->ContentDbPassword.c_str() : Config->DatabasePassword.c_str(),
-			!Config->ContentDbName.empty() ? Config->ContentDbName.c_str() : Config->DatabaseDB.c_str(),
-			Config->ContentDbPort != 0 ? Config->ContentDbPort : Config->DatabasePort
+			Config->ContentDbHost.c_str() ,
+			Config->ContentDbUsername.c_str(),
+			Config->ContentDbPassword.c_str(),
+			Config->ContentDbName.c_str(),
+			Config->ContentDbPort
 		)) {
 			LogError("Cannot continue without a content database connection");
 			return 1;