*8094* Move affiliation form to pkp lib