diff --git a/include/features.php b/include/features.php
index 14cf891b3..c2aabbc42 100644
--- a/include/features.php
+++ b/include/features.php
@@ -23,6 +23,8 @@ function get_features() {
 			array('multi_profiles', t('Multiple Profiles'),			t('Ability to create multiple profiles')),
 			array('webpages',       t('Web Pages'),                 t('Provide managed web pages on your channel')),
 			array('prettyphoto',       t('Enhanced Photo Albums'),                 t('Enable photo album with enhanced features')),
+			//FIXME - needs a description, but how the hell do we explain this to normals?
+			array('sendzid',		t('Extended Identity Sharing'),	t(' ')),
 			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options')),
 
 
diff --git a/include/text.php b/include/text.php
index 360a7357f..c7210010c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1128,14 +1128,22 @@ function prepare_text($text,$content_type = 'text/bbcode') {
 
 
 function zidify_callback($match) {
-	$replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';
+  if (feature_enabled(local_user(),'sendzid')) {
+	$replace = '<a' . $match[1] . ' href="' . zid($match[2]) . '"';}
 
+      else {
+	  $replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';}
+    
 	$x = str_replace($match[0],$replace,$match[0]);
 	return $x;
 }
 
 function zidify_links($s) {
-	$s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
+    if (feature_enabled(local_user(),'sendzid')) {
+	  $s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
+    else {
+      $s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
+
 	return $s;
 }