diff --git a/app/src/Model/Table/AdHocAttributesTable.php b/app/src/Model/Table/AdHocAttributesTable.php
index 3bdb8a142..7822a3e0f 100644
--- a/app/src/Model/Table/AdHocAttributesTable.php
+++ b/app/src/Model/Table/AdHocAttributesTable.php
@@ -43,7 +43,8 @@ class AdHocAttributesTable extends Table {
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
   use \App\Lib\Traits\QueryModificationTrait;
-  
+  use \App\Lib\Traits\AutoViewVarsTrait;
+
   /**
    * Provide the default layout
    *
diff --git a/app/templates/EmailAddresses/fields.inc b/app/templates/EmailAddresses/fields.inc
index 7676ffb3e..fcc811108 100644
--- a/app/templates/EmailAddresses/fields.inc
+++ b/app/templates/EmailAddresses/fields.inc
@@ -26,16 +26,44 @@
  */
 
 if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
-  print $this->Field->control('mail');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'mail'
+    ]]);
 
-  print $this->Field->control('type_id', ['default' => $vv_default_type]);
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'type_id',
+      'options' => [
+        'default' => $vv_default_type
+      ]
+    ]]);
 
-  print $this->Field->control('description');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'description'
+    ]]);
 
 // XXX CFM-129 need to implement verification
-  print $this->Field->control('verified', ['readonly' => true]);
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'verified',
+      'options' => [
+        'readonly' => true
+      ]
+    ]]);
 
-  print $this->Field->control('frozen');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'frozen'
+    ]]);
 
-  print $this->Field->sourceControl($vv_obj);
 }
+
+if($vv_action == 'edit' || $vv_action == 'view') {
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'source',
+      'entity' => $vv_obj
+    ]]);
+}
\ No newline at end of file