FIX: don't include default form fields for manual payments
Merge branch 'fixes/no-manual-form-fields'