diff --git a/layouts/plugins/user/terms/label.php b/layouts/plugins/user/terms/label.php
new file mode 100644
index 0000000000000..2da6ad83fca9c
--- /dev/null
+++ b/layouts/plugins/user/terms/label.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.terms
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete           Autocomplete attribute for the field.
+ * @var   boolean  $autofocus              Is autofocus enabled?
+ * @var   string   $class                  Classes for the input.
+ * @var   string   $description            Description of the field.
+ * @var   boolean  $disabled               Is this field disabled?
+ * @var   string   $group                  Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden                 Is this field hidden in the form?
+ * @var   string   $hint                   Placeholder for the field.
+ * @var   string   $id                     DOM id of the field.
+ * @var   string   $label                  Label of the field.
+ * @var   string   $labelclass             Classes to apply to the label.
+ * @var   boolean  $multiple               Does this field support multiple values?
+ * @var   string   $name                   Name of the input field.
+ * @var   string   $onchange               Onchange attribute for the field.
+ * @var   string   $onclick                Onclick attribute for the field.
+ * @var   string   $pattern                Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly               Is this field read only?
+ * @var   boolean  $repeat                 Allows extensions to duplicate elements.
+ * @var   boolean  $required               Is this field required?
+ * @var   integer  $size                   Size attribute of the input.
+ * @var   boolean  $spellcheck             Spellcheck state for the form field.
+ * @var   string   $validate               Validation rules to apply.
+ * @var   string   $value                  Value attribute of the field.
+ * @var   array    $options                Options available for this field.
+ * @var   array    $termsnote              The terms note that needs to be displayed
+ * @var   array    $translateLabel         Should the label be translated?
+ * @var   array    $translateDescription   Should the description be translated?
+ * @var   array    $translateHint          Should the hint be translated?
+ * @var   array    $termsArticle           The Article ID holding the Terms Article
+ * $var   object   $article                The Article object
+ */
+
+// Get the label text from the XML element, defaulting to the element name.
+$text = $label ? (string) $label : (string) $name;
+$text = $translateLabel ? Text::_($text) : $text;
+
+// Set required to true as this field is not displayed at all if not required.
+$required = true;
+
+JHtml::_('behavior.modal');
+
+// Build the class for the label.
+$class = !empty($description) ? 'hasPopover' : '';
+$class = $class . ' required';
+$class = !empty($labelclass) ? $class . ' ' . $labelclass : $class;
+
+// Add the opening label tag and main attributes.
+$label = '<label id="' . $id . '-lbl" for="' . $id . '" class="' . $class . '"';
+
+// If a description is specified, use it to build a tooltip.
+if (!empty($description))
+{
+	$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
+	$label .= ' data-content="' . htmlspecialchars(
+		$translateDescription ? Text::_($description) : $description,
+		ENT_COMPAT,
+		'UTF-8'
+	) . '"';
+}
+
+if (Factory::getLanguage()->isRtl())
+{
+	$label .= ' data-placement="left"';
+}
+
+$attribs          = array();
+$attribs['class'] = 'modal';
+$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+if ($article)
+{
+	$link = HTMLHelper::_('link', Route::_($article->link . '&tmpl=component'), $text, $attribs);
+}
+else
+{
+	$link = $text;
+}
+
+// Add the label text and closing tag.
+$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
+
+echo $label;
diff --git a/layouts/plugins/user/terms/message.php b/layouts/plugins/user/terms/message.php
new file mode 100644
index 0000000000000..60757d4bc4907
--- /dev/null
+++ b/layouts/plugins/user/terms/message.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.terms
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete           Autocomplete attribute for the field.
+ * @var   boolean  $autofocus              Is autofocus enabled?
+ * @var   string   $class                  Classes for the input.
+ * @var   string   $description            Description of the field.
+ * @var   boolean  $disabled               Is this field disabled?
+ * @var   string   $group                  Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden                 Is this field hidden in the form?
+ * @var   string   $hint                   Placeholder for the field.
+ * @var   string   $id                     DOM id of the field.
+ * @var   string   $label                  Label of the field.
+ * @var   string   $labelclass             Classes to apply to the label.
+ * @var   boolean  $multiple               Does this field support multiple values?
+ * @var   string   $name                   Name of the input field.
+ * @var   string   $onchange               Onchange attribute for the field.
+ * @var   string   $onclick                Onclick attribute for the field.
+ * @var   string   $pattern                Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly               Is this field read only?
+ * @var   boolean  $repeat                 Allows extensions to duplicate elements.
+ * @var   boolean  $required               Is this field required?
+ * @var   integer  $size                   Size attribute of the input.
+ * @var   boolean  $spellcheck             Spellcheck state for the form field.
+ * @var   string   $validate               Validation rules to apply.
+ * @var   string   $value                  Value attribute of the field.
+ * @var   array    $options                Options available for this field.
+ * @var   array    $termsnote              The terms note that needs to be displayed
+ * @var   array    $translateLabel         Should the label be translated?
+ * @var   array    $translateDescription   Should the description be translated?
+ * @var   array    $translateHint          Should the hint be translated?
+ * @var   array    $termsArticle           The Article ID holding the Terms Article
+ */
+
+echo '<div class="alert alert-info">' . $termsnote . '</div>';
diff --git a/plugins/user/terms/field/terms.php b/plugins/user/terms/field/terms.php
index 5cdf1f0ed21ed..f1437459ad6ed 100644
--- a/plugins/user/terms/field/terms.php
+++ b/plugins/user/terms/field/terms.php
@@ -11,10 +11,8 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormHelper;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
 
 FormHelper::loadFieldClass('radio');
 
@@ -42,9 +40,8 @@ class JFormFieldterms extends JFormFieldRadio
 	 */
 	protected function getInput()
 	{
-		$termsnote = !empty($this->element['note']) ? $this->element['note'] : Text::_('PLG_USER_TERMS_NOTE_FIELD_DEFAULT');
-
-		echo '<div class="alert alert-info">' . $termsnote . '</div>';
+		// Display the message before the field
+		echo $this->getRenderer('plugins.user.terms.message')->render($this->getLayoutData());
 
 		return parent::getInput();
 	}
@@ -63,49 +60,25 @@ protected function getLabel()
 			return '';
 		}
 
-		// Get the label text from the XML element, defaulting to the element name.
-		$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
-		$text = $this->translateLabel ? Text::_($text) : $text;
-
-		// Set required to true
-		$this->required = true;
-
-		JHtml::_('behavior.modal');
-
-		// Build the class for the label.
-		$class = !empty($this->description) ? 'hasPopover' : '';
-		$class = $class . ' required';
-		$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;
-
-		// Add the opening label tag and main attributes.
-		$label = '<label id="' . $this->id . '-lbl" for="' . $this->id . '" class="' . $class . '"';
-
-		// If a description is specified, use it to build a tooltip.
-		if (!empty($this->description))
-		{
-			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
-			$label .= ' data-content="' . htmlspecialchars(
-				$this->translateDescription ? Text::_($this->description) : $this->description,
-				ENT_COMPAT,
-				'UTF-8'
-			) . '"';
-		}
+		return $this->getRenderer('plugins.user.terms.label')->render($this->getLayoutData());
+	}
 
-		if (Factory::getLanguage()->isRtl())
-		{
-			$label .= ' data-placement="left"';
-		}
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
 
+		$article = false;
 		$termsArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
 
 		if ($termsArticle && Factory::getApplication()->isClient('site'))
 		{
-			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
-
-			$attribs          = array();
-			$attribs['class'] = 'modal';
-			$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
-
 			$db    = Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select($db->quoteName(array('id', 'alias', 'catid', 'language')))
@@ -114,6 +87,8 @@ protected function getLabel()
 			$db->setQuery($query);
 			$article = $db->loadObject();
 
+			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
 			if (Associations::isEnabled())
 			{
 				$termsAssociated = Associations::getAssociations('com_content', '#__content', 'com_content.item', $termsArticle);
@@ -123,28 +98,30 @@ protected function getLabel()
 
 			if (isset($termsAssociated) && $currentLang !== $article->language && array_key_exists($currentLang, $termsAssociated))
 			{
-				$url  = ContentHelperRoute::getArticleRoute(
+				$article->link = ContentHelperRoute::getArticleRoute(
 					$termsAssociated[$currentLang]->id,
 					$termsAssociated[$currentLang]->catid,
 					$termsAssociated[$currentLang]->language
 				);
-				$link = HTMLHelper::_('link', Route::_($url . '&tmpl=component'), $text, $attribs);
 			}
 			else
 			{
 				$slug = $article->alias ? ($article->id . ':' . $article->alias) : $article->id;
-				$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
-				$link = HTMLHelper::_('link', Route::_($url . '&tmpl=component'), $text, $attribs);
+				$article->link = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
 			}
 		}
-		else
-		{
-			$link = $text;
-		}
-
-		// Add the label text and closing tag.
-		$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
 
-		return $label;
+		$extraData = array(
+			'termsnote' => !empty($this->element['note']) ? $this->element['note'] : Text::_('PLG_USER_TERMS_NOTE_FIELD_DEFAULT'),
+			'options' => $this->getOptions(),
+			'value'   => (string) $this->value,
+			'translateLabel' => $this->translateLabel,
+			'translateDescription' => $this->translateDescription,
+			'translateHint' => $this->translateHint,
+			'termsArticle' => $termsArticle,
+			'article' => $article,
+		);
+
+		return array_merge($data, $extraData);
 	}
 }