Fixes for login
Fix