Fixes for logins