diff --git a/piwik/indico_piwik/templates/events_tracking.html b/piwik/indico_piwik/templates/events_tracking.html
index 302986c..0b953fe 100644
--- a/piwik/indico_piwik/templates/events_tracking.html
+++ b/piwik/indico_piwik/templates/events_tracking.html
@@ -1,3 +1,4 @@
+<!-- Piwik -->
 <script type="text/javascript">
     var _paq = _paq || [];
     (function() {
@@ -22,3 +23,4 @@
         s.parentNode.insertBefore(g, s);
     })();
 </script>
+<!-- End Piwik Code -->
diff --git a/piwik/indico_piwik/templates/site_tracking.html b/piwik/indico_piwik/templates/site_tracking.html
index 00f82f4..3534b20 100644
--- a/piwik/indico_piwik/templates/site_tracking.html
+++ b/piwik/indico_piwik/templates/site_tracking.html
@@ -1,13 +1,20 @@
 <!-- Piwik -->
 <script type="text/javascript">
-var _paq = _paq || [];
-(function(){ var u = (("https:" == document.location.protocol) ? "https://" : "http://");
-u += '{{ url }}';
-_paq.push(['setSiteId', {{ site_id }}]);
-_paq.push(['setTrackerUrl', u+'piwik.php']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js';
-s.parentNode.insertBefore(g,s); })();
+    var _paq = _paq || [];
+    (function() {
+        var u = (("https:" == document.location.protocol) ? "https://" : "http://");
+        u += '{{ server_url }}';
+        _paq.push(['setSiteId', {{ site_id }}]);
+        _paq.push(['setTrackerUrl', u + 'piwik.php']);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        var g = document.createElement('script');
+        var s = document.getElementsByTagName('script')[0];
+        g.type = 'text/javascript';
+        g.defer = true;
+        g.async = true;
+        g.src = u + 'piwik.js';
+        s.parentNode.insertBefore(g, s);
+    })();
 </script>
 <!-- End Piwik Code -->