Split profile form in 2 to make it easier to edit
This will create a new commit in order to revert the existing changes.
