diff --git a/modules/m_away.c b/modules/m_away.c
index cd4c89b..6cd488d 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -89,8 +89,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			free_away(source_p);
 		}
 		if(MyConnect(source_p))
-			sendto_one(source_p, form_str(RPL_UNAWAY),
-				   me.name, source_p->name);
+			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
 		return 0;
 	}
 
@@ -109,7 +108,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	}
 	
 	if(MyConnect(source_p))
-		sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);
+		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
 
 	return 0;
 }