Add active, admin flags and update accordingly