add two-step payment processing to self-service, RT#13656