Merge pull request #906 from phasehq/fix--scim-token-dialog