diff --git a/Libraries/aprs/aprs.c b/Libraries/aprs/aprs.c
--- a/Libraries/aprs/aprs.c
+++ b/Libraries/aprs/aprs.c
@@ -61,11 +61,18 @@ void aprs_send(void)
   
   // emz: modified this to get the size of the first address rather than the size of the struct itself, which fails
   ax25_send_header(addresses, sizeof(addresses)/sizeof(addresses[0]));
-  ax25_send_byte(',');
 
   char tmpBuffer[128];
-  tmpBuffer[0] = ',';
-  tmpBuffer[1] = '\0';
+
+  #ifdef FRIENDLY_MODE
+    if(HAL_GetTick() > 1000 * FRIENDLY_TIMEOUT)
+    {
+	  snprintf(tmpBuffer, 128, "KD8TDF");
+	  ax25_send_string(tmpBuffer);
+    }
+  #endif
+
+  ax25_send_byte(',');
 
   // Latitude
   snprintf(tmpBuffer, 128, "%ld,", gps_getdata()->latitude);