diff --git a/src/sbbs3/userdat.c b/src/sbbs3/userdat.c
index 911f62eebfe30e9ed894ee3deb0dfbd3584cd075..97c4d48fec954e17c37992813c55314ce437c03a 100644
--- a/src/sbbs3/userdat.c
+++ b/src/sbbs3/userdat.c
@@ -1417,6 +1417,10 @@ char* DLLCALL usermailaddr(scfg_t* cfg, char* addr, char* name)
 {
 	int i;
 
+	if(strchr(name,'@')!=NULL) { /* Avoid double-@ */
+		strcpy(addr,name);
+		return(addr);
+	}
 	if(strchr(name,'.') && strchr(name,' '))
 		sprintf(addr,"\"%s\"@",name);
 	else {