Updates for new login system