diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 10fa7c75b..2ab2a2cdc 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2735,7 +2735,12 @@ class XmlForm_Field_Link extends XmlForm_Field
                 break;
         }
 
-        $link = (!empty($value))? $value : G::replaceDataField($this->link, $v);
+        $link = "";
+        if ($this->link != "") {
+            $link = G::replaceDataField($this->link, $v);
+        } else {
+            $link = !empty($value) ? $value : "";
+        }
         $labelAux1 = (!empty($label))? $label : G::replaceDataField($this->label, $v);
         $labelAux2 = (!empty($label))? $label : G::replaceDataField($this->value, $v);
         $onclick = G::replaceDataField($this->onclick, $v);
diff --git a/workflow/engine/xmlform/dynaforms/fields/link.xml b/workflow/engine/xmlform/dynaforms/fields/link.xml
index f5e8b83f1..b584e3071 100755
--- a/workflow/engine/xmlform/dynaforms/fields/link.xml
+++ b/workflow/engine/xmlform/dynaforms/fields/link.xml
@@ -67,13 +67,7 @@
  
   leimnud.event.add(getField('PME_LINK'), 'blur', function() {
     var valor_form = new input(getField('PME_LINK'));
-    getField('PME_LINK').value=getField('PME_LINK').value.replace(/ /g, ''); 
-    if(getField('PME_LINK').value==''){
-      valor_form.failed();
-      alert('Invalid URL');
-    } else {
-      valor_form.passed();      
-      }
+    getField('PME_LINK').value=getField('PME_LINK').value.replace(/ /g, '');
   });
 function cancel(){
   currentPopupWindow.remove();