Fix add/edit manage users screen