more fixes for login issues