Merge "Use the correct userId when checking if disabled by admin."