diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index e823f8e8..d127ae87 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -1833,6 +1833,21 @@ if ( defined('HESK_DEMO') )
                           </div>
                       </div>
                   </div>
+                  <div class="form-group">
+                      <label for="custom-field-setting" class="col-sm-4 col-xs-12 control-label">
+                          <?php echo $hesklang['custom_field_setting']; ?>
+                          <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" data-placement="bottom"
+                             title="<?php echo $hesklang['custom_field_setting']; ?>"
+                             data-content="<?php echo $hesklang['custom_field_setting_help']; ?>"></i>
+                      </label>
+                      <div class="col-sm-8 col-xs-12">
+                          <div class="checkbox">
+                              <label>
+                                  <input id="custom-field-setting" name="custom-field-setting" type="checkbox" <?php if ($modsForHesk_settings['custom_field_setting']) {echo 'checked';} ?>> <?php echo $hesklang['enable_custom_field_language']; ?>
+                              </label>
+                          </div>
+                      </div>
+                  </div>
               </div>
               <!-- Mods For Hesk: Statuses -->
               <div class="tab-pane fade in" id="statuses">
diff --git a/language/en/text.php b/language/en/text.php
index c2c26c69..4b9cad67 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -27,6 +27,9 @@ $hesklang['date_custom_field_text'] = 'No options for this custom field type.';
 $hesklang['multiple_select_custom_field'] = 'Multiple Select box';
 $hesklang['multiple_select_custom_field_text'] = 'Options for this multi-select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
 $hesklang['date_format'] = 'Date must be in YYYY-MM-DD format.';
+$hesklang['custom_field_setting'] = 'Use language file for custom field names';
+$hesklang['custom_field_setting_help'] = 'Enabling this setting will use the name of the custom field as the language file\'s key, rather than the direct name itself. This will allow for translatable custom field.';
+$hesklang['enable_custom_field_language'] = 'Enable';
 
 // ADDED OR MODIFIED IN Mods For HESK 1.6.0
 $hesklang['ticket_closed'] = '[#%%TRACK_ID%%] Ticket closed/resolved';
diff --git a/modsForHesk_settings.inc.php b/modsForHesk_settings.inc.php
index fa9c9135..a24c1410 100644
--- a/modsForHesk_settings.inc.php
+++ b/modsForHesk_settings.inc.php
@@ -20,4 +20,7 @@ $modsForHesk_settings['rtl'] = 0;
 $modsForHesk_settings['show_icons'] = 0;
 
 //-- Set this to 1 to enable maintenance mode
-$modsForHesk_settings['maintenance_mode'] = 0;
\ No newline at end of file
+$modsForHesk_settings['maintenance_mode'] = 0;
+
+//-- Set this to 1 to enable custom field names as keys
+$modsForHesk_settings['custom_field_setting'] = 0;
\ No newline at end of file