diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
index b0c30c8c..c5de6897 100644
--- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
+++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html
@@ -44,7 +44,7 @@
                 <h5>{{ 'EMAIL_SUBJECT' | translate }}</h5>
             </div>
             <div class="col-sm-12">
-                <text-angular class="email-subject" ng-model="myform.respondentNotifications.subject" ta-toolbar="[['insertEmailField']]" ta-default-wrap="n"></text-angular>
+                <text-angular class="email-subject" ng-model="myform.respondentNotifications.subject" ta-toolbar="[['insertField']]" ta-default-wrap="n"></text-angular>
             </div>
         </div>
 
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html
index 932eaa57..26ec4917 100644
--- a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html
+++ b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html
@@ -41,7 +41,7 @@
             </div>
 
             <div class="col-sm-12">
-                <text-angular class="email-subject" ng-model="myform.selfNotifications.subject" ta-toolbar="[['insertEmailField']]" ta-default-wrap="n"></text-angular>
+                <text-angular class="email-subject" ng-model="myform.selfNotifications.subject" ta-toolbar="[['insertField']]" ta-default-wrap="n"></text-angular>
                 <div ng-bind="myform.selfNotifications.subject"></div>
             </div>
         </div>
diff --git a/public/modules/forms/config/forms.client.config.js b/public/modules/forms/config/forms.client.config.js
index 70e44f89..2dcc8827 100644
--- a/public/modules/forms/config/forms.client.config.js
+++ b/public/modules/forms/config/forms.client.config.js
@@ -67,25 +67,6 @@ angular.module('forms').run(['Menus',
             }
         });
 
-        taRegisterTool('insertEmailField', {
-            display: '<div class="dropdown" uib-dropdown is-open="isopen">\
-					<div class="dropdown-toggle" ng-disabled="isDisabled()" uib-dropdown-toggle>\
-						<span>{{ "ADD_A_VARIABLE" | translate }}</span>\
-						<b class="caret"></b>\
-					</div>\
-					<ul class="dropdown-menu">\
-						<li ng-repeat="field in $root.email_fields" ng-click="onClickField(field._id, field.title)">\
-							{{field.title}}\
-						</li>\
-					</ul>\
-				</div>',
-            onClickField: function(field_id, field_name){
-            	this.$editor().wrapSelection('insertHTML', '<var class="fieldVariable tag" contenteditable="false" id="' + field_id + '">' + field_name + '</var>', true);
-            },
-            action: function(){
-            }
-        });
-
 		return taOptions;
     }]);
 }]);
\ No newline at end of file