Split off form field

Splits off the form field from the database field.

This commit also has been an exercise in how you need to take care when
patching things and not do everything in a hurry.