Merge "Change secure login to use a user preference"