Enable Automatic Selection of Payment

[butchtones]

Enable Automatic  Selection of Payment is UNCHECKED in the config - checkout but it will auto select if I'm going back after already having made a purchase.

Scenario:
Unregistered user checks out and selects a payment method from the 2 options that appear.
If they go back later to buy something again their information is retained along with the payment choice.
I realize they can click the link to change payment but since that option comes up after confirm order the first order placed they don't see it until it's already done.

Is there a way to fix this?
Thanks