diff --git a/source/java/org/alfresco/repo/webdav/auth/WebDAVUser.java b/source/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
index 55ad0d1161..2d02972fa1 100644
--- a/source/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
+++ b/source/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
@@ -25,6 +25,8 @@
 
 package org.alfresco.repo.webdav.auth;
 
+import java.io.Serializable;
+
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
@@ -34,8 +36,10 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * 
  * @author GKSpencer
  */
-public class WebDAVUser
+public class WebDAVUser implements Serializable
 {
+    private static final long serialVersionUID = -6948146071131901345L;
+
     // User name
     
     private String m_userName;
diff --git a/source/java/org/alfresco/repo/webservice/content/ContentWebService.java b/source/java/org/alfresco/repo/webservice/content/ContentWebService.java
index 0f409ddd84..0cf06f6b4e 100644
--- a/source/java/org/alfresco/repo/webservice/content/ContentWebService.java
+++ b/source/java/org/alfresco/repo/webservice/content/ContentWebService.java
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -122,10 +121,10 @@ public class ContentWebService extends AbstractWebService implements
             // Work out what the server, port and context path are
             HttpServletRequest req = (HttpServletRequest)MessageContext.getCurrentContext().getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST);
     
-            String address = req.getLocalName();
+            String address = req.getServerName();
             if (req.getLocalPort() != 80)
             {
-                address = address + ":" + req.getLocalPort();
+                address = address + ":" + req.getServerPort(); 
             }
     
             // Get the file name