[PATCH 2/4] Separate API login from UI login