diff --git a/appview.php b/appview.php
index c9b59a9..d2ba5ae 100644
--- a/appview.php
+++ b/appview.php
@@ -116,7 +116,7 @@ if ($aClean['sSub'])
     if($aClean['sSub'] == 'StopMonitoring')
     {
         $oMonitor = new Monitor();
-        $oMonitor->find($_SESSION['current']->iUserId,$aClean['iAppId'],$aClean['iVersionId']);
+        $oMonitor->find($_SESSION['current']->iUserId, $aClean['iVersionId']);
         if($oMonitor->iMonitorId)
         {
             $oMonitor->delete();
diff --git a/include/monitor.php b/include/monitor.php
index ead1ead..56ba49a 100644
--- a/include/monitor.php
+++ b/include/monitor.php
@@ -36,23 +36,20 @@ class Monitor {
         }
     }
 
-    function find($iUserId, $iAppId=0, $iVersionId=0)
+    function find($iUserId, $iVersionId=0)
     {
-        if($iUserId)
+        if($iUserId && $iVersionId)
         {
-            if($iVersionId)
-            {
-                $sQuery = "SELECT *
+            $sQuery = "SELECT *
                           FROM appMonitors
                           WHERE userId = '".$iUserId."'
                           AND versionId = '".$iVersionId."'";
-                $hResult = query_appdb($sQuery);
-                $oRow = mysql_fetch_object($hResult);
-                $this->iMonitorId = $oRow->monitorId;
-                $this->iAppId = $oRow->appId;
-                $this->iVersionId = $oRow->versionId;
-                $this->iUserId = $oRow->userId;
-            }
+            $hResult = query_appdb($sQuery);
+            $oRow = mysql_fetch_object($hResult);
+            $this->iMonitorId = $oRow->monitorId;
+            $this->iAppId = $oRow->appId;
+            $this->iVersionId = $oRow->versionId;
+            $this->iUserId = $oRow->userId;
         }
     }
 
diff --git a/include/version.php b/include/version.php
index 4e48b11..01a61e2 100644
--- a/include/version.php
+++ b/include/version.php
@@ -731,8 +731,7 @@ class Version {
                     echo "<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">";
                     echo "</form>";
                     $oMonitor = new Monitor();
-                    $oMonitor->find($_SESSION['current']->iUserId,
-                                    $oApp->iAppId,$this->iVersionId);
+                    $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId);
                     if(!$oMonitor->iMonitorId)
                     {
                         echo '<form method=post name=sMessage action=appview.php?iVersionId='.$this->iVersionId.'&iAppId='.$oApp->iAppId.'>';
@@ -780,7 +779,7 @@ class Version {
             echo "</td></tr>";
         }
         $oMonitor = new Monitor();
-        $oMonitor->find($_SESSION['current']->iUserId, $oApp->iAppId, $this->iVersionId);
+        $oMonitor->find($_SESSION['current']->iUserId, $this->iVersionId);
         if($oMonitor->iMonitorId)
         {
             echo '<tr><td colspan="2" align="center">';