Don't clear mail_method or payment_method password if it's not sent through with params

Fixes #2094