Fix some issues with login/activation + orders