diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 1de3394343..420cc4771e 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -72,10 +72,11 @@ class CustomFieldsController extends Controller
     public function store(Request $request)
     {
         $field = new CustomField([
-            "name" => e($request->get("name")),
-            "element" => e($request->get("element")),
-            "field_values" => e($request->get("field_values")),
-            "field_encrypted" => e($request->get("field_encrypted", 0)),
+            "name" => $request->get("name"),
+            "element" => $request->get("element"),
+            "help_text" => $request->get("help_text"),
+            "field_values" => $request->get("field_values"),
+            "field_encrypted" => $request->get("field_encrypted", 0),
             "user_id" => Auth::user()->id
         ]);
 
@@ -87,6 +88,7 @@ class CustomFieldsController extends Controller
             $field->format = e($request->get("format"));
         }
 
+
         $validator = Validator::make(Input::all(), $field->rules);
 
         if ($validator->passes()) {
@@ -176,6 +178,7 @@ class CustomFieldsController extends Controller
         $field->field_values = e($request->get("field_values"));
         $field->field_encrypted = e($request->get("field_encrypted", 0));
         $field->user_id = Auth::user()->id;
+        $field->help_text = $request->get("help_text");
 
         if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
             $field->format = e($request->get("custom_format"));
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 23103ae85f..853b389718 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -87,7 +87,20 @@
             </div>
           </div>
 
-         @if (!$field->id)
+          <!-- Help Text -->
+          <div class="form-group {{ $errors->has('help_text') ? ' has-error' : '' }}">
+              <label for="help_text" class="col-md-4 control-label">
+                  Help Text
+              </label>
+              <div class="col-md-6">
+                  {{ Form::text('help_text', Input::old('help_text', $field->help_text), array('class' => 'form-control')) }}
+                  <p class="help-block">This is optional text that will appear below the form elements while editing an asset to provide context on the field.</p>
+                  {!! $errors->first('help_text', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+              </div>
+          </div>
+
+
+      @if (!$field->id)
           <!-- Encrypted  -->
           <div class="form-group {{ $errors->has('custom_format') ? ' has-error' : '' }}">
             <div class="col-md-8 col-md-offset-4">
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index c22e0c9f3a..76eba2d236 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -85,6 +85,8 @@
           <thead>
             <tr>
               <th>{{ trans('general.name') }}</th>
+              <th>Help Text</th>
+              <th>DB Field</th>
               <th>{{ trans('admin/custom_fields/general.field_format') }}</th>
               <th>{{ trans('admin/custom_fields/general.field_element_short') }}</th>
               <th>{{ trans('admin/custom_fields/general.fieldsets') }}</th>
@@ -92,9 +94,11 @@
             </tr>
           </thead>
           <tbody>
-            @foreach($custom_fields AS $field)
+            @foreach($custom_fields as $field)
             <tr>
               <td>{{ $field->name }}</td>
+              <td>{{ $field->help_text }}</td>
+              <td>{{ $field->convertUnicodeDbSlug() }}</td>
               <td>{{ $field->format }}</td>
               <td>{{ $field->element }}</td>
               <td>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 2cc2b01c88..6191ed4438 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -43,6 +43,10 @@
 
           @endif
 
+              @if ($field->help_text!='')
+              <p class="help-block">{{ $field->help_text }}</p>
+              @endif
+
           <?php
           $errormessage=$errors->first($field->db_column_name());
           if ($errormessage) {
@@ -57,6 +61,8 @@
             <i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
         </div>
         @endif
+
+
     </div>
   @endforeach
 @endif