diff --git a/.gitignore b/.gitignore
index 2fbb3220..4f315224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ bin/convertSettings.json
 src/static/js/jquery.js
 npm-debug.log
 *.DS_Store
+.ep_initialized
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index db0b92e4..5f44bb6f 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -98,6 +98,28 @@ if (exports.isClient) {
   };
 } else {
 
+exports.callInit = function (cb) {
+  var hooks = require("./hooks");
+  async.map(
+    Object.keys(exports.plugins),
+    function (plugin_name, cb) {
+      var plugin = exports.plugins[plugin_name];
+      fs.stat(path.normalize(path.join(plugin.package.path, ".ep_initialized")), function (err, stats) {
+        if (err) {
+          async.waterfall([
+            function (cb) { fs.writeFile(path.normalize(path.join(plugin.package.path, ".ep_initialized")), 'done', cb); },
+            function (cb) { hooks.aCallAll("init_" + plugin_name, {}, cb); },
+            cb,
+          ]);
+        } else {
+          cb();
+        }
+      });
+    },
+    function () { cb(); }
+  );
+}
+
 exports.update = function (cb) {
   exports.getPackages(function (er, packages) {
     var parts = [];
@@ -109,11 +131,12 @@ exports.update = function (cb) {
         exports.loadPlugin(packages, plugin_name, plugins, parts, cb);
       },
       function (err) {
-        exports.plugins = plugins;
+        if (err) cb(err);
+	exports.plugins = plugins;
         exports.parts = exports.sortParts(parts);
         exports.hooks = exports.extractHooks(exports.parts, "hooks");
-        exports.loaded = true;
-        cb(err);
+	exports.loaded = true;
+        exports.callInit(cb);
       }
     );
   });
diff --git a/src/templates/index.html b/src/templates/index.html
index 58f68801..ecfa0d9e 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -130,6 +130,7 @@
 
         <script src="static/custom/index.js"></script>
         <script> 
+            document.domain = document.domain;
             function go2Name() 
             {
                 var padname = document.getElementById("padname").value;
diff --git a/src/templates/pad.html b/src/templates/pad.html
index e589fb55..533bb2ba 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -280,6 +280,7 @@
               <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
             <% } %>
             <script type="text/javascript">
+                document.domain = document.domain;
                 var clientVars = {};
                 (function () {
                   <% if (settings.minify) { %>
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 02a34315..5757c48b 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -203,6 +203,7 @@
 <script type="text/javascript" src="../../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script>
 <script type="text/javascript" src="../../../static/custom/timeslider.js"></script>
 <script type="text/javascript" >
+  document.domain = document.domain;
   var clientVars = {};
   (function () {
     require.setRootURI("../../../javascripts/src");