diff --git a/app/views/application/_piwik.html.erb b/app/views/application/_piwik.html.erb
new file mode 100644
index 0000000..9c84f01
--- /dev/null
+++ b/app/views/application/_piwik.html.erb
@@ -0,0 +1,16 @@
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(["setDomains", ["*.archiving.grnet.gr"]]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//piwik.grnet.gr/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '20']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//piwik.grnet.gr/piwik.php?idsite=20" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index 669e81d..df09f92 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -1,61 +1,63 @@
 <div class="row">
   <div class="col-lg-4 col-lg-offset-2 col-md-5 col-md-offset-1 col-sm-6 col-xs-12">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4>
           <label class="glyphicon glyphicon-cloud"></label>
           &nbsp;
           Welcome
         </h4>
       </div>
 
       <div class="panel-body">
         <p>Welcome to GRNET Archiving as a Service (AaaS)</p>
 
         <p>If you are new to the service, take some time to explore its features in the hyperlink provided at the end of this page.</p>
         <p>Service's procedures, requirements and features are also available.</p>
 
         <p>Suggestions or problems should be reported to GRNET NOC's Helpdesk (<%= mail_to 'support@grnet.gr', 'support at grnet.gr' %>).</p>
 
         <a href="https://grnet.gr/services/cloud-services/archiving/" target="blank">Achiving as a Service</a>
       </div>
     </div>
   </div>
 
   <div class="col-lg-4 col-md-5 col-sm-6 col-xs-12">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4>
           <label class="glyphicon glyphicon-log-in"></label>
           &nbsp;
           Login
         </h4>
       </div>
 
       <div class="panel-body">
         <div class="row">
           <div class="col-xs-4 col-xs-offset-4 text-center">
             <%= link_to 'ViMa User', vima_path(vima: 'vima'), method: :post, role: :button,
               class: 'btn btn-default btn-lg', disabled: !Archiving.settings[:vima_oauth_enabled] %>
           </div>
         </div>
         <hr />
         <div class="row">
           <div class="col-xs-4 col-xs-offset-4 text-center">
             <%= link_to 'Institutional User', institutional_path, role: :button,
               class: 'btn btn-default btn-lg',
               disabled: !Archiving.settings[:institutional_authentication_enabled] %>
           </div>
         </div>
         <hr />
         <div class="row">
           <div class="col-xs-4 col-xs-offset-4 text-center">
             <%= link_to 'Okeanos User', '', role: :button,
               class: 'btn btn-default btn-lg',
               disabled: !Archiving.settings[:okeanos_authentication_enabled] %>
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>
+
+<%= render 'piwik' %>