Re-added different flow for login/signup