Merge "Don't hide "Add user" when disallowed by admin"