diff --git a/templates/login.html b/templates/login.html
index 45fc1645..57b94c5c 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -16,17 +16,16 @@
         | safe
         }}
         </p>
+    {% elif request.user.is_authenticated() %}
+        <p>
+        {{ "Logged-in as: %s"
+        | tr
+        | format("<b>%s</b>" | format(request.user.Username))
+        | safe
+        }}
+        <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
+        </p>
     {% else %}
-        {% if request.user.is_authenticated() %}
-            <p>
-            {{ "Logged-in as: %s"
-            | tr
-            | format("<b>%s</b>" | format(request.user.Username))
-            | safe
-            }}
-            <a href="/logout/?next={{ next }}">[{% trans %}Logout{% endtrans %}]</a>
-            </p>
-        {% else %}
         <form method="post" action="/login?next={{ next }}">
             <fieldset>
                 <legend>{% trans %}Enter login credentials{% endtrans %}</legend>
@@ -81,9 +80,7 @@
 
             </fieldset>
         </form>
-        {% endif %}
     {% endif %}
-
 </div>
 
 {% endblock %}
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 81536a3d..abdf76fb 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -128,14 +128,12 @@
                         />
                     </form>
                 </li>
-            {% else %}
-                {% if request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
-                    <li>
-                        <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
-                            {{ "Disown Package" | tr }}
-                        </a>
-                    </li>
-                {% endif %}
+            {% elif request.user.has_credential("CRED_PKGBASE_DISOWN", approved=[pkgbase.Maintainer]) %}
+                <li>
+                    <a href="/pkgbase/{{ pkgbase.Name }}/disown/">
+                        {{ "Disown Package" | tr }}
+                    </a>
+                </li>
             {% endif %}
         </ul>
     </div>
diff --git a/templates/partials/packages/comment.html b/templates/partials/packages/comment.html
index 97f11723..533ac40d 100644
--- a/templates/partials/packages/comment.html
+++ b/templates/partials/packages/comment.html
@@ -82,8 +82,7 @@
                     </form>
                 {% endif %}
 			{% endif %}
-		{% else %}
-			{% if request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
+		{% elif request.user.has_credential("CRED_COMMENT_UNDELETE", approved=[comment.User]) %}
 				<form class="undelete-comment-form"
 					  method="post"
 					  action="/pkgbase/{{ pkgbase.Name }}/comments/{{ comment.ID }}/undelete"
@@ -97,7 +96,6 @@
 							   name="submit" value="1" width="11" height="11" />
 					</fieldset>
 				</form>
-			{% endif %}
 		{% endif %}
 	</h4>
 	<div id="comment-{{ comment.ID }}-content" class="{{ article_cls }}">