diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index b55432e19..347268b9a 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -517,14 +517,6 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
 						</td>
 					</tr>
 
-					<tr>
-						<td><label for='contact-privacypolicy'>".PRFLAN_277."</label></td>
-						<td>
-							".$frm->text('contact_privacypolicy', $pref['contact_privacypolicy'], 200, array('size'=>'xxlarge'))."
-							<div class='smalltext field-help'>".PRFLAN_278."</div>
-						</td>
-					</tr>
-
 					<tr>
 						<td><label for='contact-filter'>".PRFLAN_270."</label></td>
 						<td>
@@ -558,6 +550,39 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
 		</fieldset>";
 
 
+// GDPR Settings -----------------------------
+$text .= "
+		<fieldset class='e-hideme' id='core-prefs-gdpr'>
+			<legend>".PRFLAN_277."</legend>
+			<table class='table adminform'>
+				<colgroup>
+					<col class='col-label' />
+					<col class='col-control' />
+				</colgroup>
+				<tbody>
+					<tr>
+						<td><label for='gdpr-privacypolicy'>".PRFLAN_278."</label></td>
+						<td>
+							".$frm->text('gdpr_privacypolicy', $pref['gdpr_privacypolicy'], 200, array('size'=>'xxlarge'))."
+							<div class='smalltext field-help'>".PRFLAN_279."</div>
+						</td>
+					</tr>
+
+					<tr>
+						<td><label for='gdpr-termsandconditions'>".PRFLAN_280."</label></td>
+						<td>
+							".$frm->text('gdpr_termsandconditions', $pref['gdpr_termsandconditions'], 200, array('size'=>'xxlarge'))."
+							<div class='smalltext field-help'>".PRFLAN_281."</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			".pref_submit('display')."
+		</fieldset>
+";
+
+
+
 $text .= "
 		<fieldset class='e-hideme' id='core-prefs-display'>
 			<legend>".PRFLAN_13."</legend>
@@ -1122,13 +1147,6 @@ else
 	}
 }
 
-// add new pref contact_privacypolicy
-if (!isset($pref['contact_privacypolicy']))
-{
-	$pref['contact_privacypolicy'] = '';
-	$savePrefs = true;
-}
-
 if ($savePrefs) $core_pref->setPref($pref)->save(false, true);
 
 
@@ -2058,6 +2076,7 @@ function prefs_adminmenu()
 		$var['core-prefs-header1']['header'] = LAN_BASIC_OPTIONS;
 	$var['core-prefs-main']['text'] = PRFLAN_1;
 	$var['core-prefs-email']['text'] = PRFLAN_254;
+	$var['core-prefs-gdpr']['text'] = PRFLAN_277;
 	$var['core-prefs-registration']['text'] = PRFLAN_28;
 	$var['core-prefs-signup']['text'] = PRFLAN_19;
 //	$var['core-prefs-sociallogin']['text'] = "Social Options"; // Moved into plugin.
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index e1d92cf8a..9c47d2db0 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -296,5 +296,8 @@ define("PRFLAN_274", "Contact form will only be visible to this userclass group.
 define("PRFLAN_275", "View this page using https (SSL) to modify this option");
 define("PRFLAN_276", "PHP Default (Preferred)");
 
-define("PRFLAN_277", "URL to the Privacy Policy");
-define("PRFLAN_278", "Make sure the url exists! It's best to use an absolute url.");
+define("PRFLAN_277", "GDPR Settings");
+define("PRFLAN_278", "URL to the Privacy Policy");
+define("PRFLAN_279", "Make sure the url exists! It's best to use an absolute url. This setting will be used on all places that require a consent from the user (e.g. signup, contact form/menu, etc.).");
+define("PRFLAN_280", "URL to the website terms and conditions");
+define("PRFLAN_281", "Make sure the url exists! It's best to use an absolute url. This setting will be used on all places that require a consent from the user (e.g. signup, contact form/menu, etc.).");