diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index 69ab29fcca6..3dbc04373d1 100644
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -88,6 +88,7 @@ $string['fieldmappings'] = 'Field Mappings';
 $string['fieldname'] = 'Field name';
 $string['fieldoptions'] = 'Options (one per line)';
 $string['fields'] = 'Fields';
+$string['fieldids'] = 'Field ids';
 $string['fieldupdated'] = 'Field updated';
 $string['fieldwidth'] = 'Width';
 $string['fieldwidthlistview'] = 'Width in list view';
diff --git a/mod/data/edit.php b/mod/data/edit.php
index 45debc1cad0..e811b6b900b 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -276,6 +276,8 @@
             $field = data_get_field($eachfield, $data);
             $patterns[]="[[".$field->field->name."]]";
             $replacements[] = $field->display_add_field($rid);
+            $patterns[]="[[".$field->field->name."#id]]";
+            $replacements[] = 'field_'.$field->field->id;
         }
         $newtext = str_ireplace($patterns, $replacements, $data->{$mode});
 
diff --git a/mod/data/templates.php b/mod/data/templates.php
index a58ff6c083c..fb9f43e7dbf 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -204,6 +204,14 @@
             echo '<option value="[['.$field->name.']]" title="'.$field->description.'">'.$field->name.' - [['.$field->name.']]</option>';
         }
         echo '</optgroup>';
+
+        if ($mode == 'addtemplate') {
+            echo '<optgroup label="'.get_string('fieldids', 'data').'">';
+            foreach ($fields as $field) {
+                echo '<option value="[['.$field->name.'#id]]" title="'.$field->description.' id">'.$field->name.' id - [['.$field->name.'#id]]</option>';
+            }
+            echo '</optgroup>';
+        }
         
         // Print special tags. fix for MDL-7031
         if ($mode != 'addtemplate') {