diff --git a/classquiz/routers/users.py b/classquiz/routers/users.py
index 244e543..58297ad 100644
--- a/classquiz/routers/users.py
+++ b/classquiz/routers/users.py
@@ -83,10 +83,13 @@ async def login_for_cookie_access_token(
 
     remote_ip = None
     if request.headers.get("X-Forwarded-For") is None:
-        if ", " in request.client.host:
-            remote_ip = request.client.host.split(", ")[0]
+        remote_ip = request.client.host
+
     else:
-        remote_ip = request.headers.get("X-Forwarded-For")
+        if "," in request.headers.get("X-Forwarded-For"):
+            remote_ip = request.headers.get("X-Forwarded-For").split(", ")[0]
+        else:
+            remote_ip = request.headers.get("X-Forwarded-For")
     session_key = os.urandom(32).hex()
     user_session = UserSession(
         user=user,