Merge: rev746 (Tweaked sso_login_required so user is logged out when only invalidated address is available, or when none usable email is available.)