diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index 557a23c28280c6713f3e91a80b28e2b5317fed2f..7091a0bce09b1e326fcd97d91ffcc97bce3c2eb4 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -212,8 +212,11 @@ int sbbs_t::atcodes(char *instr)
 				p++;
 			bputs(p); } }
 
-	else if(!strcmp(sp,"CPU") || !strcmp(sp,"HOST"))
+	else if(!strcmp(sp,"CPU"))
 		bputs(useron.comp);
+		
+	else if(!strcmp(sp,"HOST"))
+		bputs(client_name);
 
 	else if(!strcmp(sp,"BDATE"))
 		bputs(useron.birth);