diff --git a/include/maintainer.php b/include/maintainer.php
index a962f74..a25801f 100644
--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -353,8 +353,10 @@ class maintainer
 
         if($iVersionId)
         {
-            $hResult = query_parameters("SELECT userId from appMaintainers WHERE appMaintainers.queued = 'false' AND ".
-                                        "appMaintainers.versionId = '?'", $iVersionId);
+            $hResult = query_parameters("SELECT userId from appMaintainers, appVersion
+                WHERE appMaintainers.queued = 'false' AND appVersion.versionId = '?'
+                AND ((appMaintainers.versionId = appVersion.versionId) OR
+                (appMaintainers.appId = appVersion.appId))", $iVersionId);
         } 
         /*
          * If versionId was not supplied we fetch supermaintainers of application and maintainer of all versions.
diff --git a/include/version.php b/include/version.php
index 6cc3a2b..c76ee25 100644
--- a/include/version.php
+++ b/include/version.php
@@ -758,13 +758,10 @@ class Version {
         echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><b>Maintainers of this version:</b>\n";
         echo "<table width=\"250\" border=\"0\">";
         $aMaintainers = $this->getMaintainersUserIds();
-        $aSupermaintainers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId);
-        $aAllMaintainers = array_merge($aMaintainers,$aSupermaintainers);
-        $aAllMaintainers = array_unique($aAllMaintainers);
-        if(sizeof($aAllMaintainers)>0)
+        if(sizeof($aMaintainers)>0)
         {
             echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><ul>";
-            while(list($index, $userIdValue) = each($aAllMaintainers))
+            while(list($index, $userIdValue) = each($aMaintainers))
             {
                 $oUser = new User($userIdValue);
                 echo "<li>$oUser->sRealname (<a href=\"".BASE."contact.php?".