Fixes for login