diff --git a/include/application.php b/include/application.php
index b259934..3292ed6 100644
--- a/include/application.php
+++ b/include/application.php
@@ -751,7 +751,7 @@ class Application {
                 echo '        <form method="post" name="sMessage" action="maintainerdelete.php"><input type=submit value="Remove yourself as a super maintainer" class="button">';
             } else /* nope */
             {
-                echo '        <form method="post" name="sMessage" action="maintainersubmit.php"><input type="submit" value="Be a super maintainer of this app" class="button" title="Click here to know more about super maintainers.">';
+                echo '        <form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&iAppId='.$this->iAppId.'&sAction=add&sTitle='.urlencode("Be a Super Maintainer for ".$this->sName).'&sReturnTo='.urlencode($this->objectMakeUrl()).'"><input type="submit" value="Be a super maintainer of this app" class="button" title="Click here to know more about super maintainers.">';
             }
 
             echo "        <input type=\"hidden\" name=\"iAppId\" value=\"".$this->iAppId."\">";
diff --git a/include/maintainer.php b/include/maintainer.php
index badf981..4c63ef1 100644
--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -677,7 +677,7 @@ class maintainer
         return $oOMTableRow;
     }
 
-    function objectDisplayAddItemHelp()
+    function objectDisplayAddItemHelp($aClean)
     {
         echo "<p>This page is for submitting a request to become an application maintainer.\n";
         echo "An application maintainer is someone who runs the application \n";
@@ -691,6 +691,14 @@ class maintainer
         echo "appdb admins to identify people that are best suited for the job.  Your request\n";
         echo "may be denied if there are already a handful of maintainers for this application or if you\n";
         echo "don't have the experience with Wine that is necessary to help other users out.</p>\n";
+
+        if(!$aClean['iVersionId'])
+        {
+            echo "<p>Super maintainers are just like normal maintainers but they can modify EVERY version of\n";
+            echo "this application (and the application itself).  We don't expect you to run every version but at least to help keep\n";
+            echo "the forums clean of stale and out-of-date information.</p>\n";
+
+        }
     }
 
     function ObjectDisplayQueueProcessingHelp()
@@ -716,6 +724,9 @@ class maintainer
             case "add":
                 return array("iAppId","iVersionId");
 
+            case "addHelp":
+                return array("iVersionId");
+
             default:
                 return null;
         }
@@ -749,10 +760,10 @@ class maintainer
 
             $iSuperMaintainer = $aClean['iVersionId'] ? 0 : 1;
             echo "<input type=hidden name='iAppId' value={$aClean['iAppId']}>";
-            echo "<input type=hidden name='iVersionId' value={$aClean['iVersionId']}>";
+            echo "<input type=hidden name='iVersionId' value='{$aClean['iVersionId']}'>";
             echo "<input type=hidden name='iSuperMaintainer' value=$iSuperMaintainer>";
 
-            if($aClean['iSuperMaintainer'])
+            if($iSuperMaintainer)
                 echo '<tr valign=top><td class=color0><b>Why you want to and should<br />be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
             else
                 echo '<tr valign=top><td class=color0><b>Why you want to and should<br />be an application maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
@@ -877,6 +888,7 @@ class maintainer
         $this->iVersionId = $aClean['iVersionId'];
         $this->sReplyText = $aClean['sReplyText'];
         $this->sMaintainReason = $aClean['sMaintainReason'];
+        $this->bSuperMaintainer = $this->iVersionId ? 0 : 1;
 
         return TRUE;
     }
diff --git a/include/objectManager.php b/include/objectManager.php
index 686e6eb..0cd500c 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -652,7 +652,14 @@ class ObjectManager
 
         /* Display help if it is exists */
         if(method_exists(new $this->sClass, "objectDisplayAddItemHelp"))
-            $oObject->objectDisplayAddItemHelp();
+        {
+            $aVars = $this->get_custom_vars($aClean, "addHelp");
+
+            if($aVars)
+                $oObject->objectDisplayAddItemHelp($aClean);
+            else
+                $oObject->objectDisplayAddItemHelp();
+        }
 
         echo "<form method=\"post\">\n";
 
diff --git a/maintainersubmit.php b/maintainersubmit.php
deleted file mode 100644
index 559a292..0000000
--- a/maintainersubmit.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Adds a maintainer.
- *
- * Mandatory parameters:
- *  - iAppId, application identifier
- *            AND/OR
- *  - iVersionId, version identifier
- * 
- * Optional parameters:
- *  - iSuperMaintainer, 1 if we want to delete a supermaintainer instead of a normal maintainer
- *  - sMaintainReason, why the users want to be a maintainer
- * 
- * TODO:
- *  - replace iSuperMaintainer with bIsSuperMaintainer
- */
-
-// application environment
-require("path.php");
-require(BASE."include/incl.php");
-require_once(BASE."include/application.php");
-require_once(BASE.'include/version.php');
-
-
-/**
- * Check the input of a submitted form. And output with a list
- * of errors. (<ul></ul>)
- */
-function checkAppMaintainerInput( $maintainReason )
-{
-    $errors = "";
-
-    if ( empty( $maintainReason ) )
-    {
-        $errors .= "<li>Please enter why you would like to be an application maintainer.</li>\n";
-    }
-
-    if ( empty($errors) )
-    {
-        return "";
-    }
-    else
-    {
-        return $errors;
-    }
-}
-
-
-if(!$_SESSION['current']->isLoggedIn())
-    util_show_error_page_and_exit("You need to be logged in to apply to be a maintainer.");
-
-/* if we have a versionId to check against see if */
-/* the user is already a maintainer */
-if(!$aClean['iSuperMaintainer'] && $_SESSION['current']->isMaintainer($aClean['iVersionId']))
-{
-    echo "You are already a maintainer of this app!";
-    exit;
-}
-
-/* if this user is a super maintainer they maintain all of the versionIds of this appId */
-if($_SESSION['current']->isSuperMaintainer($aClean['iAppId']))
-{
-    echo "You are already a supermaintainer of the whole application family!";
-    exit;
-}
-
-if( $aClean['sMaintainReason'] )
-{
-    // check the input for empty/invalid fields
-    $errors = checkAppMaintainerInput($aClean['sMaintainReason']);
-    if(!empty($errors))
-        util_show_error_page_and_exit("We found the following errors:","<ul>$errors</ul><br />Please go back and correct them.");
-
-    // header
-    if($aClean['iSuperMaintainer'])
-        apidb_header("Submit SuperMaintainer Request");    
-    else
-        apidb_header("Submit Maintainer Request");    
-
-    // add to queue
-    $oMaintainer = new Maintainer();
-    $oMaintainer->iAppId = $aClean['iAppId'];
-    $oMaintainer->iVersionId = $aClean['iVersionId'];
-    $oMaintainer->iUserId = $_SESSION['current']->iUserId;
-    $oMaintainer->sMaintainReason = $aClean['sMaintainReason'];
-    $oMaintainer->bSuperMaintainer = $aClean['iSuperMaintainer'];
-
-    $hResult = $oMaintainer->create();
-
-    if ($hResult)
-    {
-        echo "<p>Your maintainer request has been submitted for review. You should hear back\n";
-        echo "soon about the status of your submission</p>\n";
-    } else
-    {
-        addmsg("Error submitting maintainer request.  Please contact the appdb admins at appdb@winehq.org", "red");
-    }
-} else
-{
-    // header
-    if($aClean['iVersionId'])
-    {
-        $oVersion = new Version($aClean['iVersionId']);
-        $oApp = new Application($oVersion->iAppId);
-        apidb_header("Request to become an application maintainer of ".$oApp->sName." ".$oVersion->sName);
-    }
-    else
-    {
-        $oApp = new Application($aClean['iAppId']);
-        apidb_header("Request to become an application super maintainer of ".$oApp->sName);
-    }
-
-    // show add to queue form
-	
-    echo '<form name="newApp" action="maintainersubmit.php" method="post" enctype="multipart/form-data">',"\n";
-
-    echo "<p>This page is for submitting a request to become an application maintainer.\n";
-    echo "An application maintainer is someone who runs the application \n";
-    echo "regularly and who is willing to be active in reporting regressions with newer \n";
-    echo "versions of Wine and to help other users run this application under Wine.</p>";
-    echo "<p>Being an application maintainer comes with new rights and new responsibilities; please be sure to read the <a href=\"".BASE."/help/?sTopic=maintainer_guidelines\">maintainer's guidelines</a> before to proceed.</p> ";
-    echo "<p>We ask that all maintainers explain why they want to be an application maintainer,\n";
-    echo "why they think they will do a good job and a little about their experience\n";
-    echo "with Wine.  This is both to give you time to\n";
-    echo "think about whether you really want to be an application maintainer and also for the\n";
-    echo "appdb admins to identify people that are best suited for the job.  Your request\n";
-    echo "may be denied if there are already a handful of maintainers for this application or if you\n";
-    echo "don't have the experience with Wine that is necessary to help other users out.</p>\n";
-
-    /* Special message for super maintainer applications */
-    if($aClean['iSuperMaintainer'])
-    {
-        echo "<p>Super maintainers are just like normal maintainers but they can modify EVERY version of\n";
-        echo "this application (and the application itself).  We don't expect you to run every version but at least to help keep\n";
-        echo "the forums clean of stale and out-of-date information.</p>\n";
-    }
-    echo "<br /><br />";
-
-    if($aClean['iSuperMaintainer'])
-        echo html_frame_start("New Super Maintainer Form",400,"",0);
-    else
-        echo html_frame_start("New Maintainer Form",400,"",0);
-
-    echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
-    echo "<tr valign=top><td class=color0>";
-    echo '<b>Application</b></td><td>'.$oApp->sName;
-    echo '</td></tr>',"\n";
-    if($aClean['iVersionId'])
-    {
-        echo "<tr valign=top><td class=color0>";
-        echo '<b>Version</b></td><td>'.$oVersion->sName;
-        echo '</td></tr>',"\n";
-    }
-    echo "<input type=hidden name='iAppId' value={$aClean['iAppId']}>";
-    echo "<input type=hidden name='iVersionId' value={$aClean['iVersionId']}>";
-    echo "<input type=hidden name='iSuperMaintainer' value={$aClean['iSuperMaintainer']}>";
-
-    if($aClean['iSuperMaintainer'])
-        echo '<tr valign=top><td class=color0><b>Why you want to and should be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
-    else
-        echo '<tr valign=top><td class=color0><b>Why you want to and should be an application maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
-
-    echo '<tr valign=top><td class=color3 align=center colspan=2> <input type=submit value=" Submit Maintainer Request " class=button> </td></tr>',"\n";
-    echo '</table>',"\n";
-
-    echo html_frame_end();
-
-	echo "</form>";
-}
-
-apidb_footer();
-
-?>