diff --git a/site/layouts/partials/sharecolumn.html b/site/layouts/partials/sharecolumn.html
index 52f5552..f1a404a 100644
--- a/site/layouts/partials/sharecolumn.html
+++ b/site/layouts/partials/sharecolumn.html
@@ -2,7 +2,7 @@
 {{ $data := index .Site.Data .Site.Language.Lang }}
 <div class="sharecolumn">
   
-<form action="/cgi/share.php" method="GET" class="share-buttons side" target="_blank">
+<form action="/share" method="GET" class="share-buttons side" target="_blank">
   <input name="popup" id="no-share-popup-side" type="radio" />
   <input name="ref" value="pmpc-side" type="hidden" />
   <input name="url" value="{{ .Site.Params.url }}" type="hidden" />  <!-- replace with your URL -->
diff --git a/site/layouts/partials/spread.html b/site/layouts/partials/spread.html
index 95abe65..a8b9f64 100644
--- a/site/layouts/partials/spread.html
+++ b/site/layouts/partials/spread.html
@@ -23,10 +23,10 @@
                 <a id="{{ .id }}" href="{{ .link }}" title="{{ .titleBefore}} {{ .name }} {{ .titleAfter  }}" target="_blank">{{ .name }}</a>
               {{ end }}
 -->
-                <form action="/cgi/share.php" method="GET" class="share-buttons spread" target="_blank">
+                <form action="/share" method="GET" class="share-buttons spread" target="_blank">
                   <input name="popup" id="no-share-popup-spread" type="radio" />
                   <input name="ref" value="pmpc-spread" type="hidden" />
-                  <input name="url" value="{{ .Site.Params.url }}#TEST" type="hidden" />
+                  <input name="url" value="{{ .Site.Params.url }}" type="hidden" />
                   <input name="title" value="Public Money, Public Code!" type="hidden" />
                   <input class="n" name="website" placeholder="Please do not put anything here" />