diff --git a/fHDHR/origin/origin_service.py b/fHDHR/origin/origin_service.py
index b69e779..469a8d8 100644
--- a/fHDHR/origin/origin_service.py
+++ b/fHDHR/origin/origin_service.py
@@ -18,12 +18,13 @@ class OriginService():
     def login(self):
         self.fhdhr.logger.info("Fetching XUMO token")
         self.geoID, self.geoLST = self.getID()
-        if not self.geoID or self.geoLST:
+        if not self.geoID or not self.geoLST:
             raise fHDHR.exceptions.OriginSetupError("XUMO Setup Failed")
         else:
             self.fhdhr.logger.info("XUMO Setup Success")
             self.status_dict["Login"] = "Success"
-            self.fhdhr.config.write(self.fhdhr.config.dict["main"]["dictpopname"], 'token', self.token)
+            self.fhdhr.config.write(self.fhdhr.config.dict["main"]["dictpopname"], 'geoID', self.geoID)
+            self.fhdhr.config.write(self.fhdhr.config.dict["main"]["dictpopname"], 'geoLST', self.geoLST)
         return True
 
     def getID(self):