diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
index 2a663c17db7a5..380872704e881 100644
--- a/administrator/components/com_contact/config.xml
+++ b/administrator/components/com_contact/config.xml
@@ -5,6 +5,7 @@
 		name="contact"
 		label="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY"
 		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		addfieldpath="/administrator/components/com_fields/models/fields"
 		>
 
 		<field
@@ -339,9 +340,9 @@
 
 		<field
 			name="show_user_custom_fields"
-			type="category"
+			type="fieldgroups"
 			multiple="true"
-			extension="com_users.user.fields"
+			context="com_users.user"
 			label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
 			description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
 			>
diff --git a/components/com_contact/views/contact/tmpl/default.xml b/components/com_contact/views/contact/tmpl/default.xml
index caf444810b440..18136fd4cf779 100644
--- a/components/com_contact/views/contact/tmpl/default.xml
+++ b/components/com_contact/views/contact/tmpl/default.xml
@@ -33,6 +33,7 @@
 		<!-- Basic options. -->
 		<fieldset name="params"
 			label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
+			addfieldpath="/administrator/components/com_fields/models/fields"
 		>
 			<field name="presentation_style"
 				type="list"
@@ -273,9 +274,9 @@
 
 			<field
 				name="show_user_custom_fields"
-				type="category"
+				type="fieldgroups"
 				multiple="true"
-				extension="com_users.user.fields"
+				context="com_users.user"
 				label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
 				description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
 				>
diff --git a/components/com_contact/views/contact/tmpl/default_user_custom_fields.php b/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
index 79bc2c37a175a..5314627925f69 100644
--- a/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
+++ b/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
@@ -21,23 +21,23 @@
 <?php endif; ?>
 
 <?php foreach ($this->contactUser->fields as $field) : ?>
-	<?php if (!in_array('-1', $displayGroups) && !in_array($field->catid, $displayGroups)) : ?>
+	<?php if (!in_array('-1', $displayGroups) && (!$field->group_id || !in_array($field->group_id, $displayGroups))) : ?>
 		<?php continue; ?>
 	<?php endif; ?>
-	<?php if (!key_exists($field->category_title, $userFieldGroups)) : ?>
-		<?php $userFieldGroups[$field->category_title] = array(); ?>
+	<?php if (!key_exists($field->group_title, $userFieldGroups)) : ?>
+		<?php $userFieldGroups[$field->group_title] = array(); ?>
 	<?php endif; ?>
-	<?php $userFieldGroups[$field->category_title][] = $field; ?>
+	<?php $userFieldGroups[$field->group_title][] = $field; ?>
 <?php endforeach; ?>
 
-<?php foreach ($userFieldGroups as $categoryTitle => $fields) : ?>
-	<?php $id = JApplicationHelper::stringURLSafe($categoryTitle); ?>
+<?php foreach ($userFieldGroups as $groupTitle => $fields) : ?>
+	<?php $id = JApplicationHelper::stringURLSafe($groupTitle); ?>
 	<?php if ($presentation_style == 'sliders') : ?>
-		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', $categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php elseif ($presentation_style == 'tabs') : ?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', $categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')); ?>
 	<?php elseif ($presentation_style == 'plain') : ?>
-		<?php echo '<h3>' . ($categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
+		<?php echo '<h3>' . ($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
 	<?php endif; ?>
 
 	<div class="contact-profile" id="user-custom-fields-<?php echo $id; ?>">
diff --git a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
index 664b70d9387c3..51f55e7fa41d3 100644
--- a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
+++ b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
@@ -20,25 +20,25 @@
 <?php endif; ?>
 
 <?php foreach ($this->contactUser->fields as $field) :?>
-	<?php if (!in_array('-1', $displayGroups) && !in_array($field->catid, $displayGroups)) : ?>
+	<?php if (!in_array('-1', $displayGroups) && (!$field->group_id || !in_array($field->group_id, $displayGroups))) : ?>
 		<?php continue; ?>
 	<?php endif; ?>
-	<?php if (!key_exists($field->category_title, $userFieldGroups)) : ?>
-		<?php $userFieldGroups[$field->category_title] = array();?>
+	<?php if (!key_exists($field->group_title, $userFieldGroups)) : ?>
+		<?php $userFieldGroups[$field->group_title] = array();?>
 	<?php endif; ?>
-	<?php $userFieldGroups[$field->category_title][] = $field;?>
+	<?php $userFieldGroups[$field->group_title][] = $field;?>
 <?php endforeach; ?>
 
-<?php foreach ($userFieldGroups as $categoryTitle => $fields) :?>
-	<?php $id = JApplicationHelper::stringURLSafe($categoryTitle); ?>
+<?php foreach ($userFieldGroups as $groupTitle => $fields) :?>
+	<?php $id = JApplicationHelper::stringURLSafe($groupTitle); ?>
 	<?php if ($this->params->get('presentation_style') == 'sliders') :
-		echo JHtml::_('sliders.panel', $categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+		echo JHtml::_('sliders.panel', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
-		<?php echo JHtmlTabs::panel($categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+		<?php echo JHtmlTabs::panel($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') == 'plain'):?>
-		<?php echo '<h3>'. ( $categoryTitle ?: JText::_('COM_CONTACT_USER_FIELDS')).'</h3>'; ?>
+		<?php echo '<h3>' . ( $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
 	<?php endif; ?>
 
 	<div class="contact-profile" id="user-custom-fields-<?php echo $id; ?>">