diff --git a/mesh_bot.py b/mesh_bot.py
index 233b5fe..1f040f1 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -211,7 +211,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
 
     # if not a DM add the username to the beginning of msg
     if not useDMForResponse and not isDM:
-        msg = "@" + get_name_from_number(message_from_id) + msg
+        msg = "@" + get_name_from_number(message_from_id, 'short', deviceID) + " " + msg
             
     return msg
 
diff --git a/pong_bot.py b/pong_bot.py
index aa84355..5e03fd3 100755
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -130,7 +130,7 @@ def handle_ping(message_from_id, deviceID,  message, hop, snr, rssi, isDM, chann
 
     # if not a DM add the username to the beginning of msg
     if not useDMForResponse and not isDM:
-        msg = "@" + get_name_from_number(message_from_id) + msg
+        msg = "@" + get_name_from_number(message_from_id, 'short', deviceID) + " " + msg
             
     return msg