Fix admin user persist/remove