diff --git a/app/assets/javascripts/custom_form_builder.coffee b/app/assets/javascripts/custom_form_builder.coffee
index 60acc0a5f5..39c4281870 100644
--- a/app/assets/javascripts/custom_form_builder.coffee
+++ b/app/assets/javascripts/custom_form_builder.coffee
@@ -270,6 +270,7 @@ class CIF.CustomFormBuilder
     localLabel = "Local Label"
     if fields[index - 1]
       localLabel = if fields[index - 1][localLabelName] then fields[index - 1][localLabelName] else localLabel
+    frmHolder = fldElement.find('.frm-holder')
     localLabelBlock = "<div class='form-group local-label-wrap' style='display: block'><label for='#{localLabelName}'>Local Label</label><div class='input-wrap'><div name='#{localLabelName}' placeholder='Local Label' class='fld-label-#{fldId} form-control' id='local-label-#{fldId}' contenteditable='true'>#{localLabel}</div></div></div>"
     localLabelBlockElement = $.parseHTML(localLabelBlock)
     frmHolder.find('.label-wrap').after(localLabelBlockElement)
diff --git a/app/assets/javascripts/multiple_form/form.coffee b/app/assets/javascripts/multiple_form/form.coffee
index bbfd1fccbc..db8d37bfa7 100644
--- a/app/assets/javascripts/multiple_form/form.coffee
+++ b/app/assets/javascripts/multiple_form/form.coffee
@@ -11,6 +11,9 @@ CIF.Client_trackingsNew = CIF.Client_trackingsCreate = CIF.Client_custom_fieldsN
     _preventCreateDatePickerClientEnrollment()
     _setAnotherLanguageFieldValue()
     _hideAnotherLanguageField()
+    
+    $('input[type="text"]').on 'keyup', (e) ->
+      console.log(e)
 
   _initICheckBox = ->
     $('.i-checks').iCheck
diff --git a/app/assets/javascripts/program_streams/form.coffee b/app/assets/javascripts/program_streams/form.coffee
index 0a311d54db..53e97f8464 100644
--- a/app/assets/javascripts/program_streams/form.coffee
+++ b/app/assets/javascripts/program_streams/form.coffee
@@ -292,7 +292,7 @@ CIF.Program_streamsNew = CIF.Program_streamsEdit = CIF.Program_streamsCreate = C
           number: builderOption.eventNumberOption()
           'radio-group': builderOption.eventRadioOption()
           select: builderOption.eventSelectOption(fields)
-          text: builderOption.eventTextFieldOption()
+          text: builderOption.eventTextFieldOption(fields)
           textarea: builderOption.eventTextAreaOption()
           separateLine: builderOption.eventSeparateLineOption()
           paragraph: builderOption.eventParagraphOption()
diff --git a/app/views/shared/fields/_text.haml b/app/views/shared/fields/_text.haml
index 101e23ee5b..42b66793db 100644
--- a/app/views/shared/fields/_text.haml
+++ b/app/views/shared/fields/_text.haml
@@ -1,7 +1,9 @@
+- label = field_label(field_props)
 %div{ class: "form-group #{field_with(field_props['label'],errors)}" }
   %label.control-label{ class: required?(field_props['required'] || false) }
     %abbr{ title: 'required' }= '*' if field_props['required'] || false
-    = field_props['label'].html_safe
-  = f.input field_props['label'], required: (field_props['required'] || false), input_html: { class: field_props['className'], placeholder: format_placeholder(field_props['placeholder']), title: field_props['description'], name: "#{f.object_name}[#{remove_field_prop_unicode(field_props)}]",  type: field_props['subtype'] , id: "#{f.object_name}[#{remove_field_prop_unicode(field_props)}]".parameterize}, label: false
+    = label.html_safe
+  = f.input field_props['label'], required: (field_props['required'] || false), input_html: { class: field_props['className'], placeholder: format_placeholder(field_props['placeholder']), title: field_props['description'], name: "#{f.object_name}[#{remove_field_prop_unicode(field_props)}]",  type: field_props['subtype'] , id: "#{f.object_name}[#{remove_field_prop_unicode(field_props)}]".parameterize, 'data-local-input': "#{f.object_name}[#{remove_local_field_prop_unicode(field_props)}]".parameterize }, label: false
+  = f.input field_props['local_label'], :as => :hidden, input_html: { name: "#{f.object_name}[#{remove_local_field_prop_unicode(field_props)}]", id: "#{f.object_name}[#{remove_local_field_prop_unicode(field_props)}]".parameterize }
   %span.help-block
     = field_message(field_props['label'], errors)