diff --git a/overlay/etc/skel/.config/pat/config.json b/overlay/etc/skel/.config/pat/config.json
index 5ef2767..f62bbd2 100644
--- a/overlay/etc/skel/.config/pat/config.json
+++ b/overlay/etc/skel/.config/pat/config.json
@@ -2,7 +2,7 @@
   "mycall": "{{ET_CALLSIGN}}",
   "secure_login_password": "{{ET_WINLINK_PASSWD}}",
   "auxiliary_addresses": [],
-  "locator": "",
+  "locator": "{{ET_GRID}}",
   "service_codes": [
     "PUBLIC"
   ],
diff --git a/overlay/opt/emcomm-tools/bin/et-winlink b/overlay/opt/emcomm-tools/bin/et-winlink
index ca3ae57..e20e292 100755
--- a/overlay/opt/emcomm-tools/bin/et-winlink
+++ b/overlay/opt/emcomm-tools/bin/et-winlink
@@ -63,6 +63,7 @@ update_config () {
     [ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json"
 
     CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign)
+    GRID=$(cat ${ET_USER_CONFIG} | jq -r .grid)
     WINLINK_PASSWD=$(cat ${ET_USER_CONFIG} | jq -r .winlinkPasswd)
 
     if [ "${CALLSIGN}" = "N0CALL" ]; then
@@ -75,6 +76,7 @@ update_config () {
 
     sed -i "s|{{ET_CALLSIGN}}|${CALLSIGN}|g" ${PAT_CONF_FILE}
     sed -i "s|{{ET_WINLINK_PASSWD}}|${WINLINK_PASSWD}|g" ${PAT_CONF_FILE}
+    sed -i "s|{{ET_GRID}}|${GRID}|g" ${PAT_CONF_FILE}
 }
 
 case $1 in