Merge "Use the right userId when setting guest restrictions"