Re-add validate and add field to form because @rafalchmiel is lazy