#PPA-6 Fix admin form