diff --git a/.gitignore b/.gitignore
index ca21dd1..613f8dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 Server/Program/env.py
+Client/env.py
\ No newline at end of file
diff --git a/Client/main.py b/Client/main.py
index f4220b7..b662caf 100644
--- a/Client/main.py
+++ b/Client/main.py
@@ -5,13 +5,8 @@ import time
 from machine import Pin, SPI, I2C
 from mfrc522 import MFRC522
 from ssd1306 import SSD1306_I2C
+from env import (DOOR_ID, WLAN_SSID, WLAN_SSID, WLAN_PASS, SERVER_IP, SERVER_PORT)
 
-# Global variables
-DOOR_ID = "[Your door ID]"
-WLAN_SSID = "[Your SSID]"
-WLAN_PASS = "[Your password]"
-SERVER_IP = "[Your server IP]"
-SERVER_PORT = 5000
 
 # Initialize RFID reader
 reader = MFRC522(spi_id=0, sck=6, miso=4, mosi=7, cs=5, rst=22)
@@ -62,6 +57,35 @@ def display_message(message, ip_address):
         print("display error:", e)
         init_oled()
 
+def test_server_connection(ip_address):
+    while True:
+        try:
+            response = requests.get(f"http://{SERVER_IP}:{SERVER_PORT}/")
+            if response.status_code == 200:
+                print("Server connection successful")
+                #display_message(f"Server Connected\nIP: {ip_address}", ip_address)
+                return
+            else:
+                print("Server connection failed")
+                display_message(f"Server Fail\nIP: {ip_address}", ip_address)
+        except Exception as e:
+            print("Server connection error:", e)
+            display_message(f"Server Error\n{e}\nIP: {ip_address}", ip_address)
+
+        # Reconnection loop
+        while True:
+            try:
+                response = requests.get(f"http://{SERVER_IP}:{SERVER_PORT}/")
+                if response.status_code == 200:
+                    print("Reconnected successfully")
+                    display_message(f"Server Reconnected\nIP: {ip_address}", ip_address)
+                    time.sleep(1)
+                    return
+                display_message(f"Reconnecting...\nIP: {ip_address}", ip_address)
+                time.sleep(1)
+            except Exception as e:
+                display_message(f"Reconnect Error\n{e}\nIP: {ip_address}", ip_address)
+                time.sleep(5)
 
 # Connect to WiFi
 def connect_wifi(ssid, password):
@@ -74,46 +98,23 @@ def connect_wifi(ssid, password):
     ip_address = wlan.ifconfig()[0]
     print("Connected to WiFi:", ip_address)
     display_message("WiFi Connected", ip_address)
+    test_server_connection(ip_address)
+    display_message(f"Server Connected\nIP: {ip_address}", ip_address)
+    time.sleep(1)
 
-    # Test connection to the server
-
-    try:
-        response = requests.get(f"http://{SERVER_IP}:{SERVER_PORT}/")
-        if response.status_code == 200:
-            print("Server connection successful")
-            display_message("Server Connected", ip_address)
-        else:
-            print("Server connection failed")
-            display_message("Server Fail", ip_address)
-            time.sleep(5)
-            while response.status_code != 200:
-                wlan.connect(ssid, password)
-                response = requests.get(f"http://{SERVER_IP}:{SERVER_PORT}/")
-                display_message("Reconnecting ...", ip_address)
-                time.sleep(1)
-    except Exception as e:
-        print("Server connection error:", e)
-        display_message(f"Server Error \n {e}", ip_address)
-        time.sleep(5)
-
-
-#         while response.status_code != 200 :
-#             wlan.connect(ssid, password)
-#             try :
-#                 response = requests.get(f"http://{SERVER_IP}:{SERVER_PORT}/")
-#                 display_message('Reconnecting ...', ip_address)
-#                 time.sleep(1)
-#             except:
-#                 pass
 # Function to send RFID UID to the server
 def send_rfid_to_server(rfid_uid):
-    url = f"http://{SERVER_IP}:{SERVER_PORT}/access"
-    headers = {"Content-Type": "application/json"}
-    data = {"rfid_uid": rfid_uid, "door_id": DOOR_ID}
-    response = requests.post(url, headers=headers, data=json.dumps(data))
-    return response.json()
-
-
+    try :
+        url = f"http://{SERVER_IP}:{SERVER_PORT}/access"
+        headers = {"Content-Type": "application/json"}
+        data = {"rfid_uid": rfid_uid, "door_id": DOOR_ID}
+        response = requests.post(url, headers=headers, data=json.dumps(data))
+        #print(response.json())
+        return response.json()
+    except Exception as e:
+        test_server_connection(ip_address = network.WLAN(network.STA_IF).ifconfig()[0])
+        return {'access_granted': False}
+    
 # Main loop to scan RFID tags
 def main():
     # Retry mechanism for OLED initialization
diff --git a/Docs/reader.md b/Docs/reader.md
index 00eb14d..43e6668 100644
--- a/Docs/reader.md
+++ b/Docs/reader.md
@@ -29,13 +29,14 @@ You can follow this guide from the raspebery py blog to initialize your Pi Pico
 Now that you Pi Pico is fully operationnal, you can upload the content of the [Client folder](../Client/) to it.
 
 ⚠️ The WIFI network **MUST** be available in 2.4 Ghz
-⚠️ Don't forget to change those variable at the beginning of [main.py](../Client/main.py)  
+⚠️ Don't forget to create the file env.py with this content  
 
 ``` python
 # Global variables
-DOOR_ID = '[Your door ID]'
+DOOR_ID = '[Your door ID]' #Without the quote
 WLAN_SSID = '[Your SSID]'
 WLAN_PASS = '[Your password]'
 SERVER_IP = '[Your server IP]'
+SERVER_PORT = 5000
 ```