diff --git a/appsubmit.php b/appsubmit.php
index 13cf313..627d408 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -33,10 +33,10 @@ function checkInput($fields)
     $errors .= "<li>Please enter an application version.</li>\n";
 
   // No vendor entered, and nothing in the list is selected
-  if (empty($fields['vendorName']) && !$fields['vendorId'])
+  if (empty($fields['vendorName']) && !$fields['vendorId'] && !$fields['appId'])
     $errors .= "<li>Please enter a vendor.</li>\n";
 
-  if (empty($fields['appDescription']))
+  if (empty($fields['appDescription']) && !$fields['appId'])
     $errors .= "<li>Please enter a description of your application.</li>\n";
 
   if (empty($errors))
diff --git a/appview.php b/appview.php
index c955a56..624a8a4 100644
--- a/appview.php
+++ b/appview.php
@@ -265,10 +265,10 @@ if($_REQUEST['appId'])
         /* are we already a maintainer? */
         if($_SESSION['current']->isSuperMaintainer($oApp->iAppId)) /* yep */
         {
-            echo '        <form method=post name=message action="maintainerdelete.php"><input type=submit value="Remove yourself as a super maintainer" class=button>';
+            echo '        <form method="post" name="message" action="maintainerdelete.php"><input type=submit value="Remove yourself as a super maintainer" class="button">';
         } else /* nope */
         {
-            echo '        <form method=post name=message action="maintainersubmit.php"><input type=submit value="Be a super maintainer of this app" class=button>';
+            echo '        <form method=post name=message action="maintainersubmit.php"><input type=submit value="Be a super maintainer of this app" class="button">';
         }
 
         echo "        <input type=\"hidden\" name=\"appId\" value=\"".$oApp->iAppId."\">";
@@ -278,6 +278,9 @@ if($_REQUEST['appId'])
         if($_SESSION['current']->isSuperMaintainer($oApp->iAppId) || $_SESSION['current']->hasPriv("admin"))
         {
             echo '        <form method="post" name="edit" action="admin/editAppFamily.php"><input type="hidden" name="appId" value="'.$_REQUEST['appId'].'"><input type="submit" value="Edit App" class="button"></form>';
+        }
+        if($_SESSION['current']->isLoggedIn())
+        {
             echo '<form method="post" name="message" action="appsubmit.php?appId='.$oApp->iAppId.'&apptype=2">';
             echo '<input type=submit value="Add Version" class="button">';
             echo '</form>';