diff --git a/include/igate.h b/include/igate.h
index a0d583e..7de5085 100644
--- a/include/igate.h
+++ b/include/igate.h
@@ -4,6 +4,7 @@
 #include <LibAPRSesp.h>
 #include <WiFiClient.h>
 #include <AX25.h>
+#include "main.h"
 
 int igateProcess(AX25Msg &Packet);
 
diff --git a/src/igate.cpp b/src/igate.cpp
index bf10637..1bebd28 100644
--- a/src/igate.cpp
+++ b/src/igate.cpp
@@ -1,11 +1,11 @@
 #include "igate.h"
 
 extern WiFiClient aprsClient;
+extern Configuration config;
 
 int igateProcess(AX25Msg &Packet)
 {
     int idx, j;
-    uint8_t ctmp;
     String header;
 
     j = 0;
@@ -46,6 +46,8 @@ int igateProcess(AX25Msg &Packet)
         header += String(F("-"));
         header += String(Packet.dst.ssid);
     }
+
+    //Add Path
     for (int i = 0; i < Packet.rpt_count; i++)
     {
         header += String(",");
@@ -58,6 +60,17 @@ int igateProcess(AX25Msg &Packet)
         if (Packet.rpt_flags & (1 << i))
             header += "*";
     }
+
+    //Add qAR,callSSID
+    header += String(F(",qAR,"));
+    header += String(config.aprs_mycall);
+    if (config.aprs_ssid > 0)
+    {
+        header += String(F("-"));
+        header += String(config.aprs_ssid);
+    }
+
+    //Add Infomation
     header += String(F(":"));
     uint8_t Raw[500];
     memset(Raw,0,sizeof(Raw));
diff --git a/src/main.cpp b/src/main.cpp
index aaa6bc5..2c81211 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -460,7 +460,7 @@ void SA818_INIT(bool boot)
 #ifdef SR_FRS
     Serial.println("Radio Module SR_FRS Init");
 #else
-    Serial.println("Radio Module SA868 Init");
+    Serial.println("Radio Module SA818/SA868 Init");
 #endif
     if (boot)
     {