diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb
index ae6d86fa1..7fb9cbc25 100644
--- a/app/assets/javascripts/samples/sample_datatable.js.erb
+++ b/app/assets/javascripts/samples/sample_datatable.js.erb
@@ -1193,34 +1193,56 @@ function changeToEditMode() {
 
       cancelEditMode();
 
-      var self = $(this);
-      var li = self.closest('li');
-      var text = li.find('.text');
-      if ($(text).find('.modal-tooltiptext').length > 0) {
-        text = $(text).find('.modal-tooltiptext');
+      var li = $(this).closest('li');
+      var url = li.attr('data-edit-url') + "/electronic_sign_edit";
+      ajaxCallEvent();
+
+      function ajaxCallEvent(){
+        $.ajax({
+          url: url,
+          success: function() {
+            var text = li.find('.text');
+            if ($(text).find('.modal-tooltiptext').length > 0) {
+              text = $(text).find('.modal-tooltiptext');
+            }
+            var textEdit = li.find('.text-edit');
+            var controls = li.find('.controls .vis,.edit,.del');
+            var controlsEdit = li.find('.controls .ok,.cancel');
+
+            // Toggle edit mode
+            columnEditMode = true;
+            li.addClass('editing');
+
+            // Set the text-edit's value
+            textEdit.val(text.text().trim());
+
+            // Toggle elements
+            text.hide();
+            controls.hide();
+            textEdit.css('display', ''); // show() doesn't work
+            controlsEdit.css('display', ''); // show() doesn't work
+            dropdownList.sortable('disable');
+            dropdownList.on('click', function(ev) {
+              ev.stopPropagation();
+            });
+            // Focus input
+            textEdit.focus();
+          },
+          error: function(e) {
+            $(li).clearFormErrors();
+            var msg = $.parseJSON(e.responseText);
+
+            renderFormError(undefined,
+                            $(li).find('.text-edit'),
+                            Object.keys(msg)[0] + ' ' + msg.name.toString());
+            var verticalHeight = $(li).offset().top;
+            dropdownList.scrollTo(verticalHeight,0);
+            setTimeout(function() {
+              $(li).clearFormErrors();
+            }, 5000);
+          }
+        });
       }
-      var textEdit = li.find('.text-edit');
-      var controls = li.find('.controls .vis,.edit,.del');
-      var controlsEdit = li.find('.controls .ok,.cancel');
-
-      // Toggle edit mode
-      columnEditMode = true;
-      li.addClass('editing');
-
-      // Set the text-edit's value
-      textEdit.val(text.text().trim());
-
-      // Toggle elements
-      text.hide();
-      controls.hide();
-      textEdit.css('display', ''); // show() doesn't work
-      controlsEdit.css('display', ''); // show() doesn't work
-      dropdownList.sortable('disable');
-      dropdownList.on('click', function(ev) {
-        ev.stopPropagation();
-      });
-      // Focus input
-      textEdit.focus();
     });
 
     // On hiding dropdown, cancel edit mode throughout dropdown
diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 64fc2519a..059512e75 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -1,7 +1,7 @@
 class CustomFieldsController < ApplicationController
   include InputSanitizeHelper
 
-  before_action :load_vars, only: [:update, :destroy, :destroy_html]
+  before_action :load_vars, except: :create
   before_action :load_vars_nested, only: [:create, :destroy_html]
   before_action :check_create_permissions, only: :create
   before_action :check_update_permissions, only: :update