Fix issue changing between payment methods in admin

Fixes #4358
Fixes #4203