diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index 5aaf3103e..9cef86e95 100644
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -41,9 +41,9 @@ elif [ "${alert}" == "test" ]; then
 	fn_alert_test
 fi
 
-if [ "${emailnotification}" == "on" ]||[ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then
+if [ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then
 	alert_email.sh
-elif [ "${emailnotification}" != "on" ]||[ "${emailalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+elif [ "${emailalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 	fn_print_warn_nl "Email alerts not enabled"
 	fn_script_log_warn "Email alerts not enabled"
 elif [ -z "${email}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index a5d3369e9..da170b8d5 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -5,9 +5,13 @@
 # Description: Defines all functions to allow download and execution of functions using fn_fetch_function.
 # This function is called first before any other function. Without this file other functions will not load.
 
-# Fix for TeamSpeak 3 scripts using gamename="Teamspeak 3"
-if [ "${gamename}" == "Teamspeak 3" ]; then 
-	gamename="TeamSpeak 3" 
+# Fixes legacy code
+if [ "${gamename}" == "Teamspeak 3" ]; then
+	gamename="TeamSpeak 3"
+fi
+
+if [ "${emailnotification}" == "on" ]; then
+    emailalert="on"
 fi
 
 # Code/functions for legacy servers