UsersEditor fixes