diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 2945de857..0de862676 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -575,6 +575,13 @@ $text .= "
 							<div class='smalltext field-help'>".PRFLAN_279."</div>
 						</td>
 					</tr>
+
+					<tr>
+						<td><label>".LAN_DESCRIPTION."</label></td>
+						<td>
+							<div class='field-help'>".nl2br(PRFLAN_281)."</div>
+						</td>
+					</tr>
 				</tbody>
 			</table>
 			".pref_submit('display')."
diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php
index 4b21497dd..ab441d5c4 100755
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
@@ -651,6 +651,11 @@ class signup_shortcodes extends e_shortcode
 	 */
 	function sc_signup_gdpr_info()
 	{
+		if (!e107::getPref('gdpr_termsandconditions', '') || !e107::getPref('gdpr_privacypolicy', ''))
+		{
+			return '';
+		}
+
 		$text = e107::getParser()->lanVars(LAN_SIGNUP_124,
 			array($this->sc_signup_gdpr_privacypolicy_link(), $this->sc_signup_gdpr_termsandconditions_link()));
 		return $text;
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index aa757801d..33abcfc0c 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -300,3 +300,4 @@ 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", "The 2 links above are used on various page on this site (e.g. signup and contact form/menu).\nPlease create 2 pages (if not already done) that contain your 'Privacy Policy' and the websites 'Terms and conditions'.\nThere are several websites that can generate those text for you.\nCopy the urls of this websites into the fields above (e.g. /page/privacy-policy or /page/terms-and-conditions).\nJust make sure, the pages and urls exist and are working!");