diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
index 2421ddd95..f5e3f721d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -337,7 +337,7 @@ class WebEntry
      *
      * return void
      */
-    protected function setWeData($webEntryUid, $arrayData)
+    protected function setWeData($webEntryUid)
     {
         try {
             //Verify data
@@ -559,17 +559,15 @@ class WebEntry
             }
 
             //Update
-            if (!isset($arrayData['WE_LINK_GENERATION']) || $arrayData['WE_LINK_GENERATION']==='DEFAULT') {
-                //Update where
-                $criteriaWhere = new \Criteria("workflow");
-                $criteriaWhere->add(\WebEntryPeer::WE_UID, $webEntryUid);
+            //Update where
+            $criteriaWhere = new \Criteria("workflow");
+            $criteriaWhere->add(\WebEntryPeer::WE_UID, $webEntryUid);
 
-                //Update set
-                $criteriaSet = new \Criteria("workflow");
-                $criteriaSet->add(\WebEntryPeer::WE_DATA, $webEntryData);
+            //Update set
+            $criteriaSet = new \Criteria("workflow");
+            $criteriaSet->add(\WebEntryPeer::WE_DATA, $webEntryData);
 
-                \BasePeer::doUpdate($criteriaWhere, $criteriaSet, \Propel::getConnection("workflow"));
-            }
+            \BasePeer::doUpdate($criteriaWhere, $criteriaSet, \Propel::getConnection("workflow"));
         } catch (\Exception $e) {
             throw $e;
         }
@@ -639,7 +637,7 @@ class WebEntry
                     }
 
                     //Set WE_DATA
-                    $this->setWeData($webEntryUid, $arrayData);
+                    $this->setWeData($webEntryUid);
 
                     //Return
                     return $this->getWebEntry($webEntryUid);
@@ -720,7 +718,7 @@ class WebEntry
                     }
 
                     //Set WE_DATA
-                    $this->setWeData($webEntryUid, $arrayData);
+                    $this->setWeData($webEntryUid);
 
                     //Return
                     if (!$this->formatFieldNameInUppercase) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
index e34cca01e..713bf91d1 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
@@ -400,6 +400,13 @@ class WebEntryEvent
                     $languages[] = $mLang['LANG_ID'];
                 }
                 $this->arrayFieldDefinition['WE_LINK_LANGUAGE']['defaultValues'] = $languages;
+            } else {
+                $this->arrayFieldDefinition['WE_LINK_SKIN']['required'] = false;
+                $this->arrayFieldDefinition['WE_LINK_LANGUAGE']['required'] = false;
+                $this->arrayFieldDefinition['WE_LINK_DOMAIN']['required'] = false;
+                $this->arrayFieldDefinition['WE_LINK_SKIN']['empty'] = true;
+                $this->arrayFieldDefinition['WE_LINK_LANGUAGE']['empty'] = true;
+                $this->arrayFieldDefinition['WE_LINK_DOMAIN']['empty'] = true;
             }
 
             $process = new BusinessModelProcess();