diff --git a/tpl/part/comments_list.tpl b/tpl/part/comments_list.tpl
index 766ff0c..f5e66f8 100644
--- a/tpl/part/comments_list.tpl
+++ b/tpl/part/comments_list.tpl
@@ -1,10 +1,10 @@
 <div id="comments_list">
-    <form action="{if isset($admin)}{poll_url id=$admin_poll_id admin=true}{else}{poll_url id=$poll_id}{/if}" method="POST">
+    <form action="{if isset($admin) && $admin}{poll_url id=$admin_poll_id admin=true}{else}{poll_url id=$poll_id}{/if}" method="POST">
     {if $comments|count > 0}
         <h3>{__('Comments', 'Comments of polled people')}</h3>
         {foreach $comments as $comment}
             <div class="comment">
-                {if isset($admin) && !$expired}
+                {if isset($admin) && $admin && !$expired}
                     <button type="submit" name="delete_comment" value="{$comment->id|html}" class="btn btn-link" title="{__('Comments', 'Remove the comment')}"><span class="glyphicon glyphicon-remove text-danger"></span><span class="sr-only">{__('Generic', 'Remove')}</span></button>
                 {/if}
                 <span class="comment_date">{$comment->date|intl_date_format:$date_format['txt_datetime_short']}</span>