Country pulldown doesn't keep selected country if there's an error in State/province

When creating an account or a new address, if an invalid State/country is introduced for the selected country (which has zones defined, for instance Germany), a state/province pulldown is shown for that country, but the Country pulldown below goes back to the store country (say, U.S.).
I think this problem gets fixed by using just
tep_get_country_list('country')
without $selected parameter in address_book_details.php and checkout_new_address.php, as the country is passed in the post parameters anyway.