new fixes for new login