diff --git a/wortschlucker/src/wortschlucker.py b/wortschlucker/src/wortschlucker.py
index f89bbf8..9d17c7b 100755
--- a/wortschlucker/src/wortschlucker.py
+++ b/wortschlucker/src/wortschlucker.py
@@ -334,7 +334,7 @@ def admin_poll(cancel=False, submit=None, admin_hash_key=None, author=None,
     # the admin hash should also not be validated - thus we may not add it before
     if errors:
         value_dict["errors"] = errors
-        return render("poll_admin.html", input_data=data, **value_dict)
+        return render("poll_admin_edit.html", input_data=data, **value_dict)
     else:
         if submit:
             # update core attributes of the existing poll
@@ -348,7 +348,7 @@ def admin_poll(cancel=False, submit=None, admin_hash_key=None, author=None,
                     poll.change_setting(key, value)
             return bobo.redirect(poll.get_admin_url())
         else:
-            return render("poll_admin.html", input_data=data, **value_dict)
+            return render("poll_admin_edit.html", input_data=data, **value_dict)
 
 @bobo.query('')
 def base():