diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index c8180f679d..6f0a31d280 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -50,7 +50,7 @@
                             <span class="view"><span id="Briefhistory">Brief history</span></span>
                             <span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&amp;biblionumber=[% biblionumber | html %]" class="button">Full history</a></span>
                         </div>
-                        <form method="get" name="f">
+                        <div id="subscriptionhistory">
                             [% FOREACH subscription_LOO IN subscription_LOOP %]
                                 <div id="subscriptionline[% subscription_LOO.subscriptionid | html %]" class="subscriptionline">
                                     <caption><h2>Subscription information for [% subscription_LOO.bibliotitle | html %]</h2><caption>
@@ -154,13 +154,25 @@
                                     [% IF ( subscription_LOO.letter ) %]
                                         [% IF ( loggedinusername ) %]
                                             [% IF ( subscription_LOO.hasalert ) %]
-                                                You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription_LOO.subscriptionid | uri %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn btn-primary" title="Cancel email notification">
-                                                    Cancel email notification
-                                                </a>
+                                                You have subscribed to email notification on new issues: 
+                                                <form name="alert_cancel" action="opac-alert-subscribe.pl" method="get">
+                                                    <input type="hidden" name="op" value="cancel" />
+                                                    <input type="hidden" name="subscriptionid" value="[% subscription_LOO.subscriptionid | uri %]" />
+                                                    <input type="hidden" name="referer" value="serial" />
+                                                    <input type="hidden" name="biblionumber" value="[% subscription_LOO.biblionumber | uri %]" />
+                                                    <button type="submit" class="btn btn-primary" title="Cancel email notification">
+                                                        Cancel email notification
+                                                    </button>
+                                                </form>
                                             [% ELSE %]
-                                                <a href="opac-alert-subscribe.pl?subscriptionid=[% subscription_LOO.subscriptionid | uri %]&amp;referer=serial&amp;biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn btn-primary" title="Subscribe to email notification on new issues">
-                                                    Subscribe to email notification on new issues
-                                                </a>
+                                                <form name="alert_subscribe" action="opac-alert-subscribe.pl" method="get">
+                                                    <input type="hidden" name="subscriptionid" value="[% subscription_LOO.subscriptionid | uri %]" />
+                                                    <input type="hidden" name="referer" value="serial" />
+                                                    <input type="hidden" name="biblionumber" value="[% subscription_LOO.biblionumber | uri %]" />
+                                                    <button type="submit" class="btn btn-primary" title="Subscribe to email notification on new issues">
+                                                        Subscribe to email notification on new issues
+                                                    </button>
+                                                </form>
                                             [% END %]
                                         [% ELSE %]
                                             You must log in if you want to subscribe to email notification on new issues
@@ -168,7 +180,7 @@
                                     [% END %]
                                 </div> <!-- / #subscriptionline* -->
                             [% END # FOREACH subscription_LOO %]
-                        </form>
+                        </div> <!-- / #subscriptionhistory -->
                     </div> <!-- / #userserialissues -->
                 </div> <!-- / .col-10/12 -->
             </div> <!-- / .row -->