Index: addresses.module
===================================================================
--- addresses.module	(revision 45)
+++ addresses.module	(working copy)
@@ -163,7 +163,7 @@
   // Reset the required fields based on the general required value
   if (empty($element['#required'])) {
     foreach ($fields as $field => $required) {
-      if ($required == ADDRESSES_FIELD_REQUIRED) {
+      if ($required == ADDRESSES_FIELD_REQUIRED && $form['#id'] == 'content-field-edit-form') {
         $fields[$field] = ADDRESSES_FIELD_SHOW;
       }
     }