diff --git a/common/dbcore.cpp b/common/dbcore.cpp
index ff0afac3a..bb233536c 100644
--- a/common/dbcore.cpp
+++ b/common/dbcore.cpp
@@ -258,9 +258,17 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (pCompress) {
 		flags |= CLIENT_COMPRESS;
 	}
+
+	//todo: we need to revisit this ssl handling later
+	//the whole connect code is ancient and tls is starting to come as a default requirement for many db setups
 	if (pSSL) {
 		flags |= CLIENT_SSL;
 	}
+	else {
+		int off = 0;
+		mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &off);
+		mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &off);
+	}
 	if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
 		pStatus = Connected;
 
diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt
index b576031dd..ca89bd357 100644
--- a/loginserver/CMakeLists.txt
+++ b/loginserver/CMakeLists.txt
@@ -26,6 +26,8 @@ set(eqlogin_headers
 	world_server.h
 )
 
+add_compile_definitions(EQEMU_USE_OPENSSL)
+
 add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
 
 install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/zone/gm_commands/set/auto_login.cpp b/zone/gm_commands/set/auto_login.cpp
index 4cf219fe8..829c739e3 100755
--- a/zone/gm_commands/set/auto_login.cpp
+++ b/zone/gm_commands/set/auto_login.cpp
@@ -2,7 +2,7 @@
 #include "../../groups.h"
 #include "../../raids.h"
 #include "../../raids.h"
-#include "../../common/repositories/account_repository.h"
+#include "../../../common/repositories/account_repository.h"
 
 void SetAutoLogin(Client* c, const Seperator* sep)
 {
diff --git a/zone/gm_commands/show/auto_login.cpp b/zone/gm_commands/show/auto_login.cpp
index 3a39230a5..2a82e5b0b 100644
--- a/zone/gm_commands/show/auto_login.cpp
+++ b/zone/gm_commands/show/auto_login.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/account_repository.h"
+#include "../../../common/repositories/account_repository.h"
 
 void ShowAutoLogin(Client* c, const Seperator* sep)
 {