Fix admin payment form not being displayed on payment method change

This change has been merged into 2-2-stable 260f1fc585b9d6e6023ada3e3b88bae0dab1c583