Merge "Pipe the user restriction to the admin dialog" into pi-dev