diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
index 0f49042586..0d0e43dadb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
@@ -157,10 +157,10 @@
             <#assign versionRow=versionRow+1>
          <tr class="${(versionRow % 2 = 0)?string("odd", "even")}">
             <td valign="top">
-               <a title="Download ${record.versionLabel}" href="${url.context}${record.url}?ticket=${session.ticket}"><img src="${url.context}/images/office/document.gif" alt="Open ${record.versionLabel}" /></a>
+               <a title="Download ${record.versionLabel}" href="${url.context}${record.url}"><img src="${url.context}/images/office/document.gif" alt="Open ${record.versionLabel}" /></a>
             </td>
             <td>
-               <a title="Download ${record.versionLabel}" href="${url.context}${record.url}?ticket=${session.ticket}"><span style="font-weight:bold;">${record.versionLabel}</span></a><br />
+               <a title="Download ${record.versionLabel}" href="${url.context}${record.url}"><span style="font-weight:bold;">${record.versionLabel}</span></a><br />
                Author: ${record.creator}<br />
                Date: ${record.createdDate?datetime}<br />
             <#if record.description?exists>
@@ -239,7 +239,7 @@
       </li>
     </#if>
       <li>
-         <a href="${url.context}/navigate/showDocDetails/workspace/SpacesStore/${d.id}?ticket=${session.ticket}" rel="_blank">
+         <a href="${url.context}/navigate/showDocDetails/workspace/SpacesStore/${d.id}" rel="_blank">
             <img src="${url.context}/images/office/document_details.gif" alt="Open Full Details" />
             Open Full Details
          </a>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
index 9235b0a04c..5326c814a7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
@@ -57,7 +57,7 @@
          <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
             <a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br />
          <#else>
-            <a href="${url.context}${child.url}?ticket=${session.ticket}" target="_blank" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br />
+            <a href="${url.context}${child.url}" target="_blank" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br />
          </#if>
          <#if child.properties.description?exists>
             <#if (child.properties.description?length > 0)>
@@ -150,7 +150,7 @@
             <br />Create a new Collaboration Space in the Alfresco Repository
          </li>
          <li>
-            <a title="Launch Alfresco" href="${url.context}/navigate/browse?ticket=${session.ticket}" rel="_blank">
+            <a title="Launch Alfresco" href="${url.context}/navigate/browse" rel="_blank">
                <img src="${url.context}/images/logo/AlfrescoLogo16.gif" alt="Launch Alfresco" />
                Launch Alfresco
             </a>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
index f6d1a65f96..8bc8761bcc 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
@@ -12,7 +12,7 @@
       <tr>
          <td width="32" valign="top"><img src="${url.context}/images/office/task_item.gif" alt="Task item" /></td>
          <td>
-            <span style="font-weight: bold;">${task.description!""?html}</span>
+            <span style="font-weight: bold;">${(task.description!"")?html}</span>
             <br />     
             <table style="margin-top: 4px;">
                <tr>
@@ -52,9 +52,9 @@
             <td>
                <a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${res.name?html}">${res.name?html}</a>
          <#else>
-            <td width="16" valign="top"><a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank" title="Open ${res.name?html}"><img src="${url.context}${res.icon16}" alt="${res.name?html}"></a></td>
+            <td width="16" valign="top"><a href="${url.context}${res.url}" target="_blank" title="Open ${res.name?html}"><img src="${url.context}${res.icon16}" alt="${res.name?html}"></a></td>
             <td>
-               <a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank">${res.name?html}</a>
+               <a href="${url.context}${res.url}" target="_blank">${res.name?html}</a>
          </#if>
             <br />
                Modified: ${res.properties.modified?datetime} (${(res.size / 1024)?int}Kb)<br />
@@ -88,7 +88,7 @@
    </#list>
       </span>
       <span class="taskManage">
-         <span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain&amp;ticket=${session.ticket}', OfficeMyTasks.refreshPage);">Manage...</span>
+         <span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain', OfficeMyTasks.refreshPage);">Manage...</span>
       </span>
    </div>
 </#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
index dd9893215a..d01f9ec50f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
@@ -156,14 +156,14 @@
       <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
             <a href="#" onclick="window.external.openDocument('${relativePath}')"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a>
       <#else>
-            <a href="${url.context}${child.url}?ticket=${session.ticket}" rel="_blank"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a>
+            <a href="${url.context}${child.url}" rel="_blank"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a>
       </#if>
          </span>
          <span class="documentItemDetails">
       <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
             <a href="#" onclick="window.external.openDocument('${relativePath}')"><span class="bold ${isVersionable?string("versionable", "notVersionable")}">${child.name?html}</span></a>
       <#else>
-            <a href="${url.context}${child.url}?ticket=${session.ticket}" rel="_blank"><span class="bold">${child.name?html}</span></a>
+            <a href="${url.context}${child.url}" rel="_blank"><span class="bold">${child.name?html}</span></a>
       </#if>
             <br />
       <#if child.properties.description?exists>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
index a7d2f5d4a9..45f9a00bd5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
@@ -26,7 +26,7 @@
             <#assign openURL = "#">
             <#assign hrefExtra = " onClick=\"window.external.openDocument('${relativePath}')\"">
          <#else>
-            <#assign openURL = "${url.context}${child.url}?ticket=${session.ticket}">
+            <#assign openURL = "${url.context}${child.url}">
             <#assign hrefExtra = " target=\"_blank\"">
          </#if>
       <#else>
diff --git a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
index 6cfcfedcf7..88bdfa9035 100644
--- a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
+++ b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
@@ -72,8 +72,8 @@ public class AuthenticationFilter implements Filter
     // Allow an authentication ticket to be passed as part of a request to bypass authentication
     
     private static final String ARG_TICKET = "ticket";
-    private static final String PPT_EXTN = ".ppt";
-    private static final String VTI_IGNORE = "&vtiIgnore";
+    private static final String PPT_EXTN = ".ppt";
+    private static final String VTI_IGNORE = "&vtiIgnore";
     
     // Servlet context
 
@@ -197,17 +197,11 @@ public class AuthenticationFilter implements Filter
             	if ( ticket != null &&  ticket.length() > 0)
             	{
             		// PowerPoint bug fix
-            		if (ticket.endsWith(PPT_EXTN))
+            		if (ticket.endsWith(PPT_EXTN))
             		{
-            			ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length());
+            			ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length());
             		}
-
-            		// vtiIgnore argument may find its way onto the ticket due to a double-encoding issue with Office
-            		if (ticket.endsWith(VTI_IGNORE))
-            		{
-            			ticket = ticket.substring(0, ticket.length() - VTI_IGNORE.length());
-            		}
-
+
                 	// Debug
                     
                     if ( logger.isDebugEnabled())