Merge "Ensure account info logged doesn't expose user data." into main