diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 5b9305ad..c18c693f 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -12394,15 +12394,14 @@ IF @OnlyFind = 1
 SET @sqlSpace = @sqlSpace + 'TOP ' + CAST(@MaximumRows AS varchar(12)) + ' '
 
 SET @sqlSpace = @sqlSpace +	'
-		EA3.ItemID AS ItemID,
+		I3.ItemID AS ItemID,
 		EAEA.EmailAddress as TextSearch,
 		''ExchangeAccount'' as ColumnType,
 		''ExchangeAccount'' as FullType,
 		SI3.PackageID as PackageID,
-		EA3.AccountID as AccountID
+		0 as AccountID
 	FROM @ItemsService AS I3
 	INNER JOIN ServiceItems AS SI3 ON I3.ItemID = SI3.ItemID
-	INNER JOIN ExchangeAccounts AS EA3 ON I3.ItemID = EA3.ItemID
 	INNER JOIN ExchangeAccountEmailAddresses AS EAEA ON I3.ItemID = EAEA.AccountID'
 IF @FilterValue <> ''
 	SET @sqlSpace = @sqlSpace + ' WHERE (EAEA.EmailAddress LIKE ''' + @FilterValue + ''')'
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 5788b660..5fc546d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -4368,6 +4368,12 @@
   <data name="ServiceItemType.VirtualSwitch" xml:space="preserve">
     <value>Virtual Switch</value>
   </data>
+  <data name="ServiceItemType.SharePointFoundationSiteCollection" xml:space="preserve">
+    <value>SharePoint Foundation Site Collection</value>
+  </data>
+  <data name="ServiceItemType.SharePointEnterpriseSiteCollection" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collection</value>
+  </data>
   <data name="TaskActivity.VPS_ADD_EXTERNAL_IP" xml:space="preserve">
     <value>Assigning external IP addresses</value>
   </data>