Merge "Check for the correct userId in callbacks"