v2 commit: fixing issues in admin flow