Refactored editUniPort form-flow to make way for editEnni-functionality