Fix for new login mechanism