Backport: Users can be based in Branch Sites