Fix for removing users properly