diff --git a/config/email.json b/config/email.json
index c1e09ffe..6c56eeb2 100644
--- a/config/email.json
+++ b/config/email.json
@@ -1,4 +1,5 @@
 {
+    "enabled": "false",
     "smtp": {
         "host":"",
         "port":"",
diff --git a/scripts/server/account.js b/scripts/server/account.js
index cbc6d78b..334882af 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -126,16 +126,18 @@ function toggleAccountServerLogoCommand(command, params, client) {
 function toggleAccountTwoFactorAuthCommand(command, params, client) {
 	let flagValue = getAccountSettingsFlagValue("twoStepAuth");
 
-	if(getPlayerData(client).accountData.emailAddress != "") {
-		messagePlayerError(client, "You need to add your email to your account to use two-factor authentication.");
-		messagePlayerTip(client, "[#FFFFFF]Use [#AAAAAA]/setemail [#FFFFFF]to add your email.");
-		return false;
-	}
+	if(getEmailConfig().enabled) {
+		if(getPlayerData(client).accountData.emailAddress != "") {
+			messagePlayerError(client, "You need to add your email to your account to use two-factor authentication.");
+			messagePlayerTip(client, "[#FFFFFF]Use [#AAAAAA]/setemail [#FFFFFF]to add your email.");
+			return false;
+		}
 
-	if(isAccountEmailVerified(getPlayerData(client).accountData)) {
-		messagePlayerError(client, "You need to verify your email to your account to use two-factor authentication.");
-		messagePlayerTip(client, "[#FFFFFF]Use [#AAAAAA]/verifyemail [#FFFFFF]to verify your email.");
-		return false;
+		if(isAccountEmailVerified(getPlayerData(client).accountData)) {
+			messagePlayerError(client, "You need to verify your email to your account to use two-factor authentication.");
+			messagePlayerTip(client, "[#FFFFFF]Use [#AAAAAA]/verifyemail [#FFFFFF]to verify your email.");
+			return false;
+		}
 	}
 
 	if(!doesPlayerHaveTwoFactorAuthEnabled(client)) {
@@ -817,9 +819,11 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress
 		showPlayerPromptGUI(client, "You have no characters. Would you like to make one?", "No Characters");
 		getPlayerData(client).promptType = AG_PROMPT_CREATEFIRSTCHAR;
 
-		let emailVerificationCode = generateEmailVerificationCode();
-		setAccountEmailVerificationCode(getPlayerData(client).accountData, emailVerificationCode);
-		sendEmailVerificationEmail(client, emailVerificationCode);
+		if(getEmailConfig().enabled) {
+			let emailVerificationCode = generateEmailVerificationCode();
+			setAccountEmailVerificationCode(getPlayerData(client).accountData, emailVerificationCode);
+			sendEmailVerificationEmail(client, emailVerificationCode);
+		}
 	} else {
 		messagePlayerAlert(client, `You have no characters. Use /newchar to make one.`);
 	}
diff --git a/scripts/server/email.js b/scripts/server/email.js
index 0fcd52a1..a38c0caf 100644
--- a/scripts/server/email.js
+++ b/scripts/server/email.js
@@ -18,17 +18,17 @@ function initEmailScript() {
 
 function sendEmail(toEmail, toName, subject, body) {
     module.smtp.send(
-        emailConfig.smtp.host,
-        emailConfig.smtp.port,
-        emailConfig.smtp.useTLS,
-        emailConfig.smtp.username,
-        emailConfig.smtp.password,
+        getEmailConfig().smtp.host,
+        getEmailConfig().smtp.port,
+        getEmailConfig().smtp.useTLS,
+        getEmailConfig().smtp.username,
+        getEmailConfig().smtp.password,
         toEmail,
         toName,
         subject,
         body,
-        emailConfig.smtp.from,
-        emailConfig.smtp.fromName);
+        getEmailConfig().smtp.from,
+        getEmailConfig().smtp.fromName);
 }
 
 // ===========================================================================