diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index b76007180ec5fe0f860e72fe2ed160564cadb510..4cc958c42e5913f0804887461e3ac677c796aac6 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -2483,6 +2483,8 @@ int fmsgtosmsg(uchar* fbuf, fmsghdr_t fmsghdr, uint user, uint subnum)
 		net=NET_FIDO;						/* Record origin address */
 
 	if(net) {
+		if(origaddr.zone==0)
+			origaddr.zone = sys_faddr.zone;
 		smb_hfield(&msg,SENDERNETTYPE,sizeof(ushort),&net);
 		smb_hfield(&msg,SENDERNETADDR,sizeof(fidoaddr_t),&origaddr); }