Fix user remove and modal