diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a8e54ead1..efa9b9268 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fix: Change Owner in Security Tab in Assets is not always Working
  - fix: API error - definition
  - fix: Calendar without i8n
+ - fix: Email field in Commerce Area small
  - All toolbar icons now have a class called "toolbarIcon" so they can be
    styled by external CSS.
  - Profile fields and categories and have confirmation boxes when deleting using the side menu
diff --git a/lib/WebGUI/Commerce/Payment.pm b/lib/WebGUI/Commerce/Payment.pm
index 3e1b9cea7..1eafcb8e4 100644
--- a/lib/WebGUI/Commerce/Payment.pm
+++ b/lib/WebGUI/Commerce/Payment.pm
@@ -463,7 +463,7 @@ sub prepend {
 	$self = shift;
 	$name = shift;
 
-	return "~Payment~".$self->namespace."~".$name;
+	return "Payment_".$self->namespace."_".$name;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Commerce/Shipping.pm b/lib/WebGUI/Commerce/Shipping.pm
index efb59ba0b..88ec3c8cc 100644
--- a/lib/WebGUI/Commerce/Shipping.pm
+++ b/lib/WebGUI/Commerce/Shipping.pm
@@ -300,7 +300,7 @@ sub prepend {
 	$self = shift;
 	$name = shift;
 
-	return "~Shipping~".$self->namespace."~".$name;
+	return "Shipping_".$self->namespace."_".$name;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 783565e23..f9c35a12f 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -821,7 +821,7 @@ sub www_editCommerceSettingsSave {
 
 		# Store the plugin configuration data in a special table for security and the general settings in the
 		# normal settings table for easy access.
-		if (/~([^~]*)~([^~]*)~([^~]*)/) {
+		if (/([^_]*)_([^_]*)_([^_]*)/) {
 			WebGUI::Commerce::setCommerceSetting($session,{
 				type		=> $1,
 				namespace	=> $2,