diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
index 32aa52e3cb..6d7a37cfef 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
@@ -188,6 +188,15 @@ public abstract class BaseServlet extends HttpServlet
       }
    }
    
+   /**
+    * Apply the headers required to disallow caching of the response in the browser
+    */
+   public static void setNoCacheHeaders(HttpServletResponse res)
+   {
+      res.setHeader("Cache-Control", "no-cache");
+      res.setHeader("Pragma", "no-cache");
+   }
+   
    /**
     * Returns true if the specified JSP file is valid for a redirect after login.
     * Only a specific sub-set of the available JSPs are valid to jump directly too after a
diff --git a/source/java/org/alfresco/web/app/servlet/CommandServlet.java b/source/java/org/alfresco/web/app/servlet/CommandServlet.java
index bb8d8d7133..4f661a0785 100644
--- a/source/java/org/alfresco/web/app/servlet/CommandServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/CommandServlet.java
@@ -96,6 +96,8 @@ public class CommandServlet extends BaseServlet
          return;
       }
       
+      setNoCacheHeaders(res);
+      
       uri = uri.substring(req.getContextPath().length());
       StringTokenizer t = new StringTokenizer(uri, "/");
       int tokenCount = t.countTokens();
diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
index 6844398778..8dfea0b241 100644
--- a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
@@ -100,6 +100,8 @@ public class ExternalAccessServlet extends BaseServlet
          return;
       }
       
+      setNoCacheHeaders(res);
+      
       uri = uri.substring(req.getContextPath().length());
       StringTokenizer t = new StringTokenizer(uri, "/");
       int tokenCount = t.countTokens();
diff --git a/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
index ce42f9a1ce..73466bbe25 100644
--- a/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
@@ -114,6 +114,8 @@ public class TemplateContentServlet extends BaseTemplateContentServlet
          return;
       }
       
+      setNoCacheHeaders(res);
+      
       processTemplateRequest(req, res, true);
    }