Textfield with default value keeps overwriting saved value

With Ubercart Addresses 6.x-2.x enabled, when you create a textfield with a default value with Extra Fields Pane, this default value keeps showing up on every address form, overwriting any saved values.
This happens for example:

• In the address book (when editing an address).
• When editing an order.
• When going back to the checkout page coming from the checkout review page.

This is because in the code, the field saved value is only set when there is no default value (± line 80 of includes/uc_addresses.handlers.inc):

$field[$fieldName] += array(
  '#default_value' => $default,
);

The Drupal 7 version of Extra Fields Pane is also affected.

A fix will be committed shortly for both 6.x-2.x and 7.x-1.x.