diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 2ad4b4983e..5640fc79fb 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -1341,6 +1341,22 @@ public class AVMBrowseBean implements IContextListener
       return AVMUtil.isMainStore(this.sandbox);
    }
    
+   /**
+    *  Indicates whether link validation is available (virtualization server is accessible).
+    *  It can be used in the 'rendered' attribute in some tags. 
+    *  @see org.alfresco.linkvalidation.LinkValidationServiceImpl#isLinkValidationDisabled()
+    *  
+    *  @return TRUE if link validation is ENABLED (virtualization server IS ACCESSIBLE)
+    */
+   public boolean getLinkValidationEnabled()
+   {
+       boolean enabled = !linkValidationService.isLinkValidationDisabled();
+       if (logger.isDebugEnabled())
+       {
+           logger.debug("Link validation enabled:" + String.valueOf(enabled).toUpperCase());
+       }
+       return enabled;
+   }
    
    // ------------------------------------------------------------------------------
    // Action event handlers
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index aa66e6f86c..d0d15ab1b9 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -102,7 +102,7 @@ public class SubmitDialog extends BaseDialogBean
    private String[] workflowSelectedValue;
    private boolean enteringExpireDate = false;
    private boolean loadSelectedNodesFromBrowseBean = false;
-   private boolean validateLinks = true;
+   private boolean validateLinks = false;
    private boolean autoDeploy = false;
    private Date defaultExpireDate;
    private Date launchDate;
@@ -289,7 +289,7 @@ public class SubmitDialog extends BaseDialogBean
       this.defaultExpireDate = new Date();
       this.workflowSelectedValue = null;
       this.launchDate = null;
-      this.validateLinks = true;
+      this.validateLinks = this.avmBrowseBean.getLinkValidationEnabled();
       this.autoDeploy = false;
       this.workflowParams = null;
       this.sandboxInfo = null;
@@ -826,6 +826,17 @@ public class SubmitDialog extends BaseDialogBean
       this.autoDeploy = autoDeploy;
    }
 
+   /**
+    * 
+    * @return linkValidationEnabled flag to indicate whether link validation is turned on
+    *         and virtualization server is available.
+    *  
+    */
+   public boolean getLinkValidationEnabled()
+   {
+       return this.avmBrowseBean.getLinkValidationEnabled();
+   }
+   
    /**
     * @return List of UIListItem object representing the available workflows for the website
     */
diff --git a/source/web/jsp/wcm/browse-website.jsp b/source/web/jsp/wcm/browse-website.jsp
index 3393800888..0c8f0bfb37 100644
--- a/source/web/jsp/wcm/browse-website.jsp
+++ b/source/web/jsp/wcm/browse-website.jsp
@@ -139,7 +139,7 @@
                               </td>
                               <td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td>
                               <td align=right>
-                                 <a:actionLink id="actLinks" value="#{msg.check_links}" image="/images/icons/run_link_validation.gif" 
+                                 <a:actionLink id="actLinks" rendered="#{AVMBrowseBean.linkValidationEnabled}" value="#{msg.check_links}" image="/images/icons/run_link_validation.gif" 
                                                actionListener="#{DialogManager.setupParameters}" action="dialog:linkValidation"
                                                rendered="#{AVMBrowseBean.linkValidationEnabled}">
                                     <f:param name="store" value="#{AVMBrowseBean.stagingStore}" />
diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp
index 60f26d9ad9..f8388a5227 100644
--- a/source/web/jsp/wcm/submit-dialog.jsp
+++ b/source/web/jsp/wcm/submit-dialog.jsp
@@ -90,7 +90,7 @@
 </h:panelGrid>
 
 <h:panelGrid columns="2" cellspacing="0" cellpadding="2" style="margin-left: 20px; margin-top: 6px;"
-             rendered="#{DialogManager.bean.workflowListSize != 0}">
+             rendered="#{DialogManager.bean.workflowListSize != 0 && DialogManager.bean.linkValidationEnabled == true}">
    <h:selectBooleanCheckbox id="links-chkbox" value="#{DialogManager.bean.validateLinks}" />
    <h:outputText value="#{msg.check_links}&nbsp;(#{msg.check_links_info})" escape="false" />
 </h:panelGrid>
diff --git a/source/web/scripts/ajax/common.js b/source/web/scripts/ajax/common.js
index f0269b8283..d3f309d52c 100644
--- a/source/web/scripts/ajax/common.js
+++ b/source/web/scripts/ajax/common.js
@@ -63,7 +63,14 @@ function handleErrorYahoo(e)
  */
 function setContextPath(contextPath)
 {
-   _alfContextPath = contextPath;
+   if (window.location.pathname.indexOf(contextPath) == 0 ) 
+   { 
+      _alfContextPath = contextPath; 
+   } 
+   else 
+   { 
+      _alfContextPath = ""; 
+   } 
 }
 
 /**