Fix issue where all payment method fields were shown on payment screen

Fixes #2785
Fixes #2813