Set expiration date from form field.

Also move the expiration to a hybrid field