Revert "Change login requiring behaviour."

This reverts commit 765dcdbded5cc2e74112c4077494cec0c8e06c7f.