diff --git a/src/smblib/smbstr.c b/src/smblib/smbstr.c
index dbd8412a305f978b7f0cf32b1676075db7b272a6..26c000de9f040cc492ca17337c13662b82f0bc80 100644
--- a/src/smblib/smbstr.c
+++ b/src/smblib/smbstr.c
@@ -324,16 +324,18 @@ char* SMBCALL smb_netaddrstr(net_t* net, char* fidoaddr_buf)
 }
 
 /****************************************************************************/
-/* Returns net_type for passed e-mail address (i.e. "user@addr")			*/
+/* Returns net_type for passed e-mail address (e.g. "user@addr")			*/
+/* QWKnet and Internet addresses must have an '@'.							*/
+/* FidoNet addresses may be in form: "user@addr" or just "addr".			*/
 /****************************************************************************/
 enum smb_net_type SMBCALL smb_netaddr_type(const char* str)
 {
-	char*	p;
+	const char*	p;
 
 	if((p=strchr(str,'@'))==NULL)
-		return(NET_NONE);
-
-	p++;
+		p = str;
+	else
+		p++;
 	SKIP_WHITESPACE(p);
 	if(*p==0)
 		return(NET_UNKNOWN);