diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index dd80d4f0f..bf2c8bc8b 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2016,7 +2016,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
     } else {
       $html  = "";
       $html .= '<span id="form['. $this->name . ']">';
-      $html .= $this->htmlentities ( $link, ENT_QUOTES, 'utf-8' );
+      $html .= $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' );
       $html .= '</span>';    
     }