Revert "XX-11482 - Cannot edit users in admin portal"

This reverts commit eb2b1104bb184580774ea3367459d9a4d8fefdae.