diff --git a/src/sbbs3/filedat.c b/src/sbbs3/filedat.c
index 52f3f48cce37612dc46d88325a06f09128ddff60..20558ba8a83790b0a47d673ec0be75e1aaceed07 100644
--- a/src/sbbs3/filedat.c
+++ b/src/sbbs3/filedat.c
@@ -701,7 +701,7 @@ int file_client_hfields(file_t* f, client_t* client)
 		return i;
 	if(*client->host && (i = smb_hfield_str(f, SENDERHOSTNAME, client->host)) != SMB_SUCCESS)
 		return i;
-	if(client->protocol != NULL && (i = smb_hfield_str(f, SENDERPROTOCOL, client->protocol)) != SMB_SUCCESS)
+	if((i = smb_hfield_str(f, SENDERPROTOCOL, client->protocol)) != SMB_SUCCESS)
 		return i;
 	if(client->port) {
 		char	port[16];
diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c
index f23220c1aa60b87bdae3d2a5f9ae6ced9de31507..1ba025024cce6b90e96204da9ba417dc216d30bb 100644
--- a/src/sbbs3/js_system.c
+++ b/src/sbbs3/js_system.c
@@ -1825,8 +1825,7 @@ js_new_user(JSContext *cx, uintN argc, jsval *arglist)
 		}
 	}
 	if(client!=NULL) {
-		if(client->protocol != NULL)
-			SAFECOPY(user.modem,client->protocol);
+		SAFECOPY(user.modem,client->protocol);
 		SAFECOPY(user.comp,client->host);
 		SAFECOPY(user.ipaddr,client->addr);
 	}
diff --git a/src/sbbs3/postmsg.cpp b/src/sbbs3/postmsg.cpp
index 7724f0ae5b10ad3e0b95ae25c1c7f7a4323441bb..f7630d7449e6837e4adf34d6c4f9de63162fe30e 100644
--- a/src/sbbs3/postmsg.cpp
+++ b/src/sbbs3/postmsg.cpp
@@ -397,7 +397,7 @@ extern "C" int msg_client_hfields(smbmsg_t* msg, client_t* client)
 	if(*client->host
 		&& (i=smb_hfield_str(msg,SENDERHOSTNAME,client->host))!=SMB_SUCCESS)
 		return(i);
-	if(client->protocol!=NULL && (i=smb_hfield_str(msg,SENDERPROTOCOL,client->protocol))!=SMB_SUCCESS)
+	if((i=smb_hfield_str(msg,SENDERPROTOCOL,client->protocol))!=SMB_SUCCESS)
 		return(i);
 	if(client->port) {
 		SAFEPRINTF(port,"%u",client->port);