diff --git a/include/application.php b/include/application.php
index 47bbdd5..fcbde66 100644
--- a/include/application.php
+++ b/include/application.php
@@ -887,6 +887,9 @@ class Application {
         $oTableRow->SetClass("color4");
         $oTable->SetHeader($oTableRow);
 
+        if($bQueued)
+            $oTableRow->addTextCell("Action");
+
         for($i = 1; $oRow = query_fetch_object($hResult); $i++)
         {
           
@@ -900,6 +903,15 @@ class Application {
             $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime)));
             $oTableRow->SetClass(($i % 2) ? "color0" : "color1");
 
+            if($bQueued)
+            {
+                $oM = new objectManager('application');
+                $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : "");
+                $shDeleteLink = '<a href="'.$oM->makeUrl("delete", $oApp->iAppId, "Delete entry").'">delete</a>';
+                $shEditLink = '<a href="'.$oM->makeUrl("edit", $oApp->iAppId, "Edit entry").'">edit</a>';
+                $oTableRow->addTextCell("[ $shEditLink ] &nbsp; [ $shDeleteLink ]");
+            }
+
             $oTable->AddRow($oTableRow);
         }
 
diff --git a/include/downloadurl.php b/include/downloadurl.php
index e188ddc..408bcbe 100644
--- a/include/downloadurl.php
+++ b/include/downloadurl.php
@@ -258,7 +258,9 @@ class downloadurl
             return TRUE;
         } else
         {
-            return FALSE;
+            $oVersion = new version($this->iVersionId);
+
+            return $oVersion->canEdit();
         }
     }
 
diff --git a/include/maintainer.php b/include/maintainer.php
index 64e1037..0633c00 100644
--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -685,7 +685,7 @@ class maintainer
 
     function canEdit()
     {
-        if($_SESSION['current']->hasPriv("admin"))
+        if($_SESSION['current']->hasPriv("admin") || $this->iUserId == $_SESSION['current']->iUserId)
             return TRUE;
 
         return FALSE;