diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5d84a0980..48016ca0d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.6.0
+ - fixed: editting DataForm email fields resets their name
  - no longer preloads files that start with .
  - rfe: let package import inherit permissions
  - added fieldsets around form controls with multiple elements
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 0ca64abad..aa3095f05 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -1095,6 +1095,12 @@ sub www_editFieldSave {
     my $fieldName = $form->process('fieldName');
     my $newName = $self->session->url->urlize($form->process('newName') || $form->process('label'));
     $newName =~ tr{-/}{};
+    if ($fieldName) {
+        my $field = $self->getFieldConfig($fieldName);
+        if ($field->{isMailField}) {
+            $newName = $fieldName;
+        }
+    }
     if (!$fieldName || $fieldName ne $newName) {
         my $i = '';
         while ($self->getFieldConfig($newName . $i)) {