diff --git a/source/java/org/alfresco/web/app/servlet/PageRendererServlet.java b/source/java/org/alfresco/web/app/servlet/PageRendererServlet.java
index 5be5a84d84..640c050e11 100644
--- a/source/java/org/alfresco/web/app/servlet/PageRendererServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/PageRendererServlet.java
@@ -174,6 +174,8 @@ public class PageRendererServlet extends WebScriptServlet
          }
       }
       
+      setNoCacheHeaders(res);
+      
       try
       {
          // lookup template path from page config in website AVM store
@@ -447,6 +449,15 @@ public class PageRendererServlet extends WebScriptServlet
              (page != null ? page + '/' : "") + "page-definition.xml";
    }
    
+   /**
+    * Apply the headers required to disallow caching of the response in the browser
+    */
+   private static void setNoCacheHeaders(HttpServletResponse res)
+   {
+      res.setHeader("Cache-Control", "no-cache");
+      res.setHeader("Pragma", "no-cache");
+   }
+   
    
    /**
     * WebScript runtime for the PageRenderer servlet.
@@ -707,7 +718,7 @@ public class PageRendererServlet extends WebScriptServlet
 
       public long getLastModified(Object templateSource)
       {
-         return last--;
+         return last++;
       }
 
       public Reader getReader(Object templateSource, String encoding) throws IOException
diff --git a/source/java/org/alfresco/web/app/servlet/PageTemplateProcessor.java b/source/java/org/alfresco/web/app/servlet/PageTemplateProcessor.java
index 33f133e5c8..944867c8d1 100644
--- a/source/java/org/alfresco/web/app/servlet/PageTemplateProcessor.java
+++ b/source/java/org/alfresco/web/app/servlet/PageTemplateProcessor.java
@@ -45,5 +45,6 @@ public class PageTemplateProcessor extends TemplateProcessor
    public void initConfig()
    {
       super.initConfig();
+      templateConfig.setTemplateUpdateDelay(0);
    }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/web/scripts/ScriptUrlMethod.java b/source/java/org/alfresco/web/scripts/ScriptUrlMethod.java
index f0c57884af..25e27bf9bb 100644
--- a/source/java/org/alfresco/web/scripts/ScriptUrlMethod.java
+++ b/source/java/org/alfresco/web/scripts/ScriptUrlMethod.java
@@ -94,6 +94,10 @@ public final class ScriptUrlMethod implements TemplateMethodModelEx
                       buf.append('&');
                    }
                 }
+                else
+                {
+                   buf.append('?');
+                }
                 buf.append("guest=" + (req.isGuest() ? "true" : ""));
                 if (req.getFormatStyle() == FormatStyle.argument)
                 {