diff --git a/services/web/server/src/simcore_service_webserver/login/handlers.py b/services/web/server/src/simcore_service_webserver/login/handlers.py
index d681e9108cc..ec873853a39 100644
--- a/services/web/server/src/simcore_service_webserver/login/handlers.py
+++ b/services/web/server/src/simcore_service_webserver/login/handlers.py
@@ -101,7 +101,7 @@ async def login(request: web.Request):
                     "code": LoginCode.PHONE_NUMBER_REQUIRED,  # this string is used by the frontend to show phone registration page
                     "reason": "To login, please register first a phone number",
                 },
-                status=web.HTTPAccepted.status_code,  # FIXME: error instead?? front-end needs to show a reg
+                status=web.HTTPAccepted.status_code,
             )
             return rsp
 
@@ -165,7 +165,6 @@ async def login_2fa(request: web.Request):
             reason=cfg.MSG_WRONG_2FA_CODE, content_type=MIMETYPE_APPLICATION_JSON
         )
 
-    # FIXME: ask to register if user not found!!
     user = await db.get_user({"email": email})
 
     # dispose since used
diff --git a/services/web/server/src/simcore_service_webserver/login/handlers_registration.py b/services/web/server/src/simcore_service_webserver/login/handlers_registration.py
index cba3c7e22ac..2a426802488 100644
--- a/services/web/server/src/simcore_service_webserver/login/handlers_registration.py
+++ b/services/web/server/src/simcore_service_webserver/login/handlers_registration.py
@@ -36,7 +36,6 @@
 
 def _get_user_name(email: str) -> str:
     username = email.split("@")[0]
-    # TODO: this has to be unique and add this in user registration!
     return username
 
 
@@ -87,7 +86,7 @@ async def register(request: web.Request):
             ),
             "role": USER,
             "expires_at": expires_at,
-            "created_ip": get_client_ip(request),  # FIXME: does not get right IP!
+            "created_ip": get_client_ip(request),
         }
     )