diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 031ad7294..bfe14a7a5 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -226,6 +226,19 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
               <td><?php echo buildSelect( "filter[terms][$i][val]", $monitors ); ?></td>
+<?php
+        }
+        elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "ServerId" )
+        {
+            $servers = array();
+            $servers['ZM_SERVER_ID'] = 'Current Server';
+            foreach ( dbFetchAll( "SELECT Id,Name FROM Servers ORDER BY lower(Name) ASC" ) as $server )
+            {
+                    $servers[$server['Id']] = $server['Name'];
+            }
+?>
+              <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
+              <td><?php echo buildSelect( "filter[terms][$i][val]", $servers ); ?></td>
 <?php
         }
         elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "StorageId" )