Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	8 Aug 2006 09:35:17 -0000	1.18
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	18 Dec 2006 19:14:23 -0000	1.19
@@ -231,7 +231,7 @@
 	lappend message "[_ ams.Your_delivery_address_is_too_many_lines]"
     }
 
-    if { $country_code eq "" } {
+    if { $country_code eq "" && $delivery_address ne ""} {
 	lappend message "[_ ams.country] is required."
     }
 
Index: openacs-4/packages/ams/tcl/ams-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/ams-widget-procs.tcl,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/ams/tcl/ams-widget-procs.tcl	8 Aug 2006 09:35:17 -0000	1.33
+++ openacs-4/packages/ams/tcl/ams-widget-procs.tcl	18 Dec 2006 19:14:23 -0000	1.34
@@ -1741,7 +1741,11 @@
     set country_code [string trim $country_code]
     set additional_text [string trim $additional_text]
     set postal_type [string trim $postal_type]
-    return [db_string save_value {} -default {}]
+    if {$delivery_address eq "" && $country_code eq ""} {
+	return ""
+    } else {
+	return [db_string save_value {} -default {}]
+    }
 }
 
 ad_proc -private ams::util::telecom_number_save {