updated for login issue