diff --git a/admin/deleteAny.php b/admin/deleteAny.php
index d9e3708..b7e4c87 100644
--- a/admin/deleteAny.php
+++ b/admin/deleteAny.php
@@ -36,7 +36,7 @@ if($_REQUEST['what'])
             } else
             {
                 $oComment->delete();
-                redirect(BASE."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']);
+                redirect(BASE."appview.php?versionId=".$oComment->iVersionId);
             }
 	    break;
 	case "category":
diff --git a/include/comment.php b/include/comment.php
index 8311386..637d880 100644
--- a/include/comment.php
+++ b/include/comment.php
@@ -225,13 +225,16 @@ function view_app_comment($ob)
     echo "</td></tr>\n";
 
     // delete message button, for admins
-    if ($_SESSION['current']->isLoggedIn() && ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($ob->appId,$ob->versionId) ))
+    if ($_SESSION['current']->hasPriv("admin")
+     || $_SESSION['current']->isMaintainer($ob->versionId) 
+     || $_SESSION['current']->isSuperMaintainer($ob->appId))
     {
         echo "<tr>";
-        echo "<td><form method=\"post\" name=\"message\" action=\"".BASE."deletecomment.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n";
+        echo "<td><form method=\"post\" name=\"message\" action=\"".BASE."admin/deleteAny.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n";
         echo "<input type=\"hidden\" name=\"commentId\" value=\"$ob->commentId\" />";
-        echo "<input type=\"hidden\" name=\"appId\" value=\"$ob->appId\" />";
-        echo "<input type=\"hidden\" name=\"versionId\" value=\"$ob->versionId\" /></form>","\n";
+        echo "<input type=\"hidden\" name=\"confirmed\" value=\"yes\" />";
+        echo "<input type=\"hidden\" name=\"what\" value=\"comment\" />";
+        echo "</form>\n";
         echo "</td></tr>";
     }