diff --git a/administrator/components/com_fields/libraries/fieldsplugin.php b/administrator/components/com_fields/libraries/fieldsplugin.php
index 3a88cb0e774e3..b545a791a93c1 100644
--- a/administrator/components/com_fields/libraries/fieldsplugin.php
+++ b/administrator/components/com_fields/libraries/fieldsplugin.php
@@ -165,6 +165,7 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form
 		$node->setAttribute('name', $field->name);
 		$node->setAttribute('type', $field->type);
 		$node->setAttribute('label', $field->label);
+		$node->setAttribute('labelclass', $field->params->get('label_class'));
 		$node->setAttribute('description', $field->description);
 		$node->setAttribute('class', $field->params->get('class'));
 		$node->setAttribute('hint', $field->params->get('hint'));
diff --git a/administrator/components/com_fields/models/forms/field.xml b/administrator/components/com_fields/models/forms/field.xml
index e8183ace672c0..5de6ea4522f98 100644
--- a/administrator/components/com_fields/models/forms/field.xml
+++ b/administrator/components/com_fields/models/forms/field.xml
@@ -223,6 +223,13 @@
 
 	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="basic">
+
+			<field
+				name="formoptions"
+				type="note"
+				label="COM_FIELDS_FIELD_FORMOPTIONS_HEADING"
+			/>
+
 			<field
 				name="hint"
 				type="text"
@@ -233,19 +240,47 @@
 			/>
 
 			<field
-				name="render_class"
+				name="class"
 				type="textarea"
-				label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
-				description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
+				label="COM_FIELDS_FIELD_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_CLASS_DESC"
 				class="input-xxlarge"
 				size="40"
 			/>
 
 			<field
-				name="class"
+				name="label_class"
 				type="textarea"
-				label="COM_FIELDS_FIELD_CLASS_LABEL"
-				description="COM_FIELDS_FIELD_CLASS_DESC"
+				label="COM_FIELDS_FIELD_LABEL_FORM_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_LABEL_FORM_CLASS_DESC"
+				class="input-xxlarge"
+				size="40"
+			/>
+
+			<field
+				name="show_on"
+				type="radio"
+				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
+				description="COM_FIELDS_FIELD_SHOW_ON_DESC"
+				class="btn-group btn-group-yesno"
+				default=""
+				>
+				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
+				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
+				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
+			</field>
+
+			<field
+				name="renderoptions"
+				type="note"
+				label="COM_FIELDS_FIELD_RENDEROPTIONS_HEADING"
+			/>
+
+			<field
+				name="render_class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
 				class="input-xxlarge"
 				size="40"
 			/>
@@ -263,17 +298,14 @@
 			</field>
 
 			<field
-				name="show_on"
-				type="radio"
-				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
-				description="COM_FIELDS_FIELD_SHOW_ON_DESC"
-				class="btn-group btn-group-yesno"
-				default=""
-				>
-				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
-				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
-				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
-			</field>
+				name="label_render_class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_LABEL_RENDER_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_LABEL_RENDER_CLASS_DESC"
+				class="input-xxlarge"
+				size="40"
+				showon="showlabel:1"
+			/>
 
 			<field
 				name="display"
diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini
index 9ce691cbecc0f..8a6a770754e6d 100644
--- a/administrator/language/en-GB/en-GB.com_fields.ini
+++ b/administrator/language/en-GB/en-GB.com_fields.ini
@@ -8,7 +8,9 @@ COM_FIELDS_BATCH_GROUP_LABEL="To Move or Copy your selection please select a gro
 COM_FIELDS_BATCH_GROUP_OPTION_NONE="- No Group -"
 COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item)."
 COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. If multiple classes are needed, list them with spaces."
-COM_FIELDS_FIELD_CLASS_LABEL="Edit Class"
+COM_FIELDS_FIELD_CLASS_LABEL="Field Class"
+COM_FIELDS_FIELD_FORMOPTIONS_HEADING="Form Options"
+COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Render Options"
 COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field renders."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Show Label"
 COM_FIELDS_FIELD_DEFAULT_VALUE_DESC="The default value of the field."
@@ -32,7 +34,11 @@ COM_FIELDS_FIELD_IMAGE_DESC="Image label."
 COM_FIELDS_FIELD_IMAGE_LABEL="Image"
 COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE="The default value is invalid."
 COM_FIELDS_FIELD_LABEL_DESC="The label of the field to display."
+COM_FIELDS_FIELD_LABEL_FORM_CLASS_DESC="The class of the label in the form."
+COM_FIELDS_FIELD_LABEL_FORM_CLASS_LABEL="Label Class"
 COM_FIELDS_FIELD_LABEL_LABEL="Label"
+COM_FIELDS_FIELD_LABEL_RENDER_CLASS_DESC="The class of the label in the output."
+COM_FIELDS_FIELD_LABEL_RENDER_CLASS_LABEL="Label Class"
 COM_FIELDS_FIELD_LANGUAGE_DESC="Assign a language to this field."
 COM_FIELDS_FIELD_NOTE_DESC="An optional note for the field."
 COM_FIELDS_FIELD_NOTE_LABEL="Note"
diff --git a/components/com_contact/layouts/field/render.php b/components/com_contact/layouts/field/render.php
index 65baec530acfd..85ef140589126 100644
--- a/components/com_contact/layouts/field/render.php
+++ b/components/com_contact/layouts/field/render.php
@@ -18,6 +18,7 @@
 $value     = $field->value;
 $class     = $field->params->get('render_class');
 $showLabel = $field->params->get('showlabel');
+$labelClass = $field->params->get('label_render_class');
 
 if ($field->context == 'com_contact.mail')
 {
@@ -36,7 +37,7 @@
 ?>
 <dt class="contact-field-entry <?php echo $class; ?>">
 	<?php if ($showLabel == 1) : ?>
-		<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+		<span class="field-label <?php echo $labelClass; ?>"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
 	<?php endif; ?>
 </dt>
 <dd class="contact-field-entry <?php echo $class; ?>">
diff --git a/components/com_fields/layouts/field/render.php b/components/com_fields/layouts/field/render.php
index 9c8d91170ed9e..11bf5b4de422d 100644
--- a/components/com_fields/layouts/field/render.php
+++ b/components/com_fields/layouts/field/render.php
@@ -17,6 +17,7 @@
 $label = JText::_($field->label);
 $value = $field->value;
 $showLabel = $field->params->get('showlabel');
+$labelClass = $field->params->get('label_render_class');
 
 if ($value == '')
 {
@@ -25,6 +26,6 @@
 
 ?>
 <?php if ($showLabel == 1) : ?>
-	<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+	<span class="field-label <?php echo $labelClass; ?>"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
 <?php endif; ?>
 <span class="field-value"><?php echo $value; ?></span>