diff --git a/GreenPonik_BLE/gattserver.py b/GreenPonik_BLE/gattserver.py
index c925a42..d386450 100644
--- a/GreenPonik_BLE/gattserver.py
+++ b/GreenPonik_BLE/gattserver.py
@@ -82,10 +82,7 @@ def __init__(self, index):
             elif "psk" in x:
                 self.pwd = x.split('"')[-2]
             elif "country" in x:
-                self.country = x.split('=')[-1]
-        self.ssid = "ssid_init"
-        self.pwd = "pwd_init"
-        self.country = "country_init"
+                self.country = x.split('=')[-1].strip('\n')
         self.wifichange = False
         Service.__init__(self, index, self.JSON_SVC_UUID, True)
         self.add_characteristic(JsonCharacteristic(self))