diff --git a/pagure/templates/edit_tag.html b/pagure/templates/edit_tag.html
index 762129c..f406558 100644
--- a/pagure/templates/edit_tag.html
+++ b/pagure/templates/edit_tag.html
@@ -7,13 +7,13 @@
 
 {% block repo %}
 
-<h2>Edit tag: {{ tag }}</h2>
+<h2>Edit tag: {{ edit_tag }}</h2>
 
 <section class="edit_tag">
     <form action="{{ url_for('.edit_tag',
-                     username=username, repo=repo.name, tag=tag) }}" method="post">
+                     username=username, repo=repo.name, tag=edit_tag) }}" method="post">
 
-    <p>Enter in the field below the new name for the tag: "{{ tag }}"</p>
+    <p>Enter in the field below the new name for the tag: "{{ edit_tag }}"</p>
     <table>
       {{ render_field_in_row(form.tag) }}
     </table>
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 38650c5..3f916d6 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -269,7 +269,7 @@ def edit_tag(repo, tag, username=None):
         form=form,
         username=username,
         repo=repo,
-        tag=tag,
+        edit_tag=tag,
     )