Ensure create user button still exists when adding only third party
Merge branch 'hotfix/v1.18.2'