diff --git a/project-build.xml b/project-build.xml
index 2dadb725ee..86a4399e06 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -76,8 +76,8 @@
 	    
       <!-- add config files to WEB-INF/classes -->
       <copy todir="${dir.assemble}/WEB-INF/classes">
-         <fileset dir="${dir.config.repository}" excludes="**/*.sample" />
-         <fileset dir="${dir.config.webclient}" excludes="**/*.sample" />
+         <fileset dir="${dir.config.repository}" excludes="**/extension/**" />
+         <fileset dir="${dir.config.webclient}" excludes="**/extension/**" />
       </copy>
       
       <!-- clean up previously generated properties files -->
diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
index 02e68a8ad9..d78afae405 100644
--- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.lock.LockService;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionService;
@@ -638,7 +639,8 @@ public class DocumentDetailsBean extends BaseDetailsBean
    }
    
    /**
-    * @return the working copy document Node for this document if found or null if not
+    * @return the working copy document Node for this document if found and the 
+    *         current has permission or null if not
     */
    public Node getWorkingCopyDocument()
    {
@@ -650,6 +652,13 @@ public class DocumentDetailsBean extends BaseDetailsBean
          if (workingCopyRef != null)
          {
             workingCopyNode = new Node(workingCopyRef);
+            
+            // if the current user does not have read permission on 
+            // working copy return null
+            if (workingCopyNode.hasPermission(PermissionService.READ) == false)
+            {
+               workingCopyNode = null;
+            }
          }
       }
       
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index bb7327b815..89e61a4ad3 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -75,7 +75,7 @@
                               <div class="mainSubText">
                                  <h:outputText value="#{msg.location}" />: <r:nodePath value="#{DocumentDetailsBean.document.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" />
                               </div>
-                              <a:panel id="working-copy" rendered="#{DocumentDetailsBean.locked}">
+                              <a:panel id="working-copy" rendered="#{DocumentDetailsBean.locked && DocumentDetailsBean.workingCopyDocument != null}">
                                  <div class="mainSubText">
                                     <h:outputText id="out-workingcopy" value="#{msg.working_copy_document}" />:
                                     <a:actionLink id="act-details" rendered="#{DocumentDetailsBean.workingCopyDocument != null}" value="#{DocumentDetailsBean.workingCopyDocument.properties.name}" actionListener="#{BrowseBean.setupContentAction}" action="showDocDetails">