Small refactor in profile forms