diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp
index e85b6104d9e5afaed38c10f9bb9c56cc0594a3eb..3a4d9864bee64dbd68dd22d771f91c2864b4578d 100644
--- a/src/sbbs3/writemsg.cpp
+++ b/src/sbbs3/writemsg.cpp
@@ -1052,6 +1052,9 @@ void sbbs_t::forwardmail(smbmsg_t *msg, int usernumber)
 	SAFEPRINTF(str,"%u",useron.number);
 	smb_hfield_str(msg,SENDEREXT,str);
 
+	/* Security logging */
+	msg_client_hfields(msg,&client);
+
 	username(&cfg,usernumber,touser);
 	smb_hfield_str(msg,RECIPIENT,touser);
 	SAFEPRINTF(str,"%u",usernumber);