Backport fix to UserAdmin site_id
Backport: Users can be based in Branch Sites