diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 56efa0c..cfea33a 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -325,9 +325,9 @@
       </div>
     {% endif %}
 
-    <div class="col-md-4">
+    <div class="col-md-4 card-block">
       <button class="btn btn-md" id="subcribe-btn"
-      {% if subscribed -%}
+      {% if g.fas_user.username in subscribers -%}
         title="Unsubscribe to this issue">Unsubscribe
       {%- else -%}
         title="Subscribe to this issue">Subscribe
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 416d04e..baa4e1a 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -878,11 +878,6 @@ def view_issue(repo, issueid, username=None, namespace=None):
     for key in issue.other_fields:
         knowns_keys[key.key.name] = key
 
-    subscribed = False
-    if authenticated():
-        subscribed = pagure.lib.is_watching_obj(
-            SESSION, flask.g.fas_user.username, issue)
-
     return flask.render_template(
         'issue.html',
         select='issues',
@@ -893,7 +888,6 @@ def view_issue(repo, issueid, username=None, namespace=None):
         issueid=issueid,
         form=form,
         knowns_keys=knowns_keys,
-        subscribed=subscribed,
         subscribers=pagure.lib.get_watch_list(SESSION, issue),
     )