diff --git a/bridge_gps_data.py b/bridge_gps_data.py
index 1ea62e3..e6bc0ba 100755
--- a/bridge_gps_data.py
+++ b/bridge_gps_data.py
@@ -280,7 +280,10 @@ def user_setting_write(dmr_id, setting, value):
                 user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
             if setting.upper() == 'PIN':
                 try:
-                    user_dict[dmr_id][4]['pin'] = value
+                    if user_dict[dmr_id]:
+                        user_dict[dmr_id][4]['pin'] = value
+                    if not user_dict[dmr_id]:
+                        user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': pin}]
                 except:
                     user_dict[dmr_id].append({'pin': value})
             f.close()
diff --git a/gps_data.py b/gps_data.py
index 60acfaa..04b8b9e 100644
--- a/gps_data.py
+++ b/gps_data.py
@@ -281,7 +281,10 @@ def user_setting_write(dmr_id, setting, value):
                 user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
             if setting.upper() == 'PIN':
                 try:
-                    user_dict[dmr_id][4]['pin'] = value
+                    if user_dict[dmr_id]:
+                        user_dict[dmr_id][4]['pin'] = value
+                    if not user_dict[dmr_id]:
+                        user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': pin}]
                 except:
                     user_dict[dmr_id].append({'pin': value})
             f.close()