diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index 6513eedeea26fd156ff0d2ac7d95304a36291d8e..ac2868e412c4c611400f5dc2b645396399e2d261 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -357,7 +357,7 @@ bool sbbs_t::logon()
 					if(getstr(useron.netmail,LEN_NETMAIL,K_EDIT|K_AUTODEL|K_LINE))
 						break;
 				}
-				if(useron.netmail[0] && !noyes(text[ForwardMailQ]))
+				if(useron.netmail[0] && cfg.sys_misc&SM_FWDTONET && !noyes(text[ForwardMailQ]))
 					useron.misc|=NETMAIL;
 				else 
 					useron.misc&=~NETMAIL;
diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp
index 10baf857404dab518e3b53ec38face8c5f1a63fc..49b31b05fd7bd8c70a1d76742c83e090b69721c4 100644
--- a/src/sbbs3/newuser.cpp
+++ b/src/sbbs3/newuser.cpp
@@ -225,7 +225,7 @@ void sbbs_t::newuser()
 			if(getstr(useron.netmail,LEN_NETMAIL,K_EDIT|K_AUTODEL|K_LINE))
 				break;
 		}
-		if(useron.netmail[0] && yesno(text[ForwardMailQ]))
+		if(useron.netmail[0] && cfg.sys_misc&SM_FWDTONET && yesno(text[ForwardMailQ]))
 			useron.misc|=NETMAIL;
 		else 
 			useron.misc&=~NETMAIL;