diff --git a/WebsitePanel/Database/install_db.sql b/WebsitePanel/Database/install_db.sql
index 51ea6af1..52c9914d 100644
--- a/WebsitePanel/Database/install_db.sql
+++ b/WebsitePanel/Database/install_db.sql
@@ -26213,6 +26213,12 @@ AS
 							INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
 							INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
 							WHERE pt.ParentPackageID = @PackageID)
+		ELSE IF @QuotaID = 320 -- OCS Users
+			SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea 
+							INNER JOIN OCSUsers ocs ON ea.AccountID = ocs.AccountID
+							INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
+							INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
+							WHERE pt.ParentPackageID = @PackageID)
 		ELSE IF @QuotaID = 206 -- HostedSolution.Users
 			SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea
 				INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 445609d2..4b0cff19 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -1765,6 +1765,12 @@ AS
 							INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
 							INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
 							WHERE pt.ParentPackageID = @PackageID)
+		ELSE IF @QuotaID = 320 -- OCS Users
+			SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts ea 
+							INNER JOIN OCSUsers ocs ON ea.AccountID = ocs.AccountID
+							INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
+							INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
+							WHERE pt.ParentPackageID = @PackageID)
 		ELSE IF @QuotaID = 206 -- HostedSolution.Users
 			SET @Result = (SELECT COUNT(ea.AccountID) FROM ExchangeAccounts AS ea
 				INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
index 3e12319d..36060e76 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
@@ -189,4 +189,10 @@
   <data name="lblLyncUsers.Text" xml:space="preserve">
     <value>Lync Users:</value>
   </data>
+  <data name="lblExchangeAccounts.Text" xml:space="preserve">
+    <value>Exchange Mailboxes:</value>
+  </data>
+  <data name="lblExchangeStorage.Text" xml:space="preserve">
+    <value>Exchange Storage, MB:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
index 66a65218..117042ca 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
@@ -30,6 +30,14 @@
         <td class="SubHead" nowrap><asp:Label ID="lblUserAccounts" runat="server" meta:resourcekey="lblUserAccounts" Text="User Accounts:"></asp:Label></td>
         <td class="Normal"><wsp:Quota ID="quotaUserAccounts" runat="server" QuotaName="HostedSolution.Users" DisplayGauge="True" /></td>
     </tr>
+    <tr ID="pnlExchangeAccounts" runat="server">
+        <td class="SubHead" nowrap><asp:Label ID="lblExchangeAccounts" runat="server" meta:resourcekey="lblExchangeAccounts" Text="Exchange Accounts:"></asp:Label></td>
+        <td class="Normal"><wsp:Quota ID="quotaExchangeAccounts" runat="server" QuotaName="Exchange2007.Mailboxes" DisplayGauge="True" /></td>
+    </tr>
+    <tr ID="pnlExchangeStorage" runat="server">
+        <td class="SubHead" nowrap><asp:Label ID="lblExchangeStorage" runat="server" meta:resourcekey="lblExchangeStorage" Text="Exchange Storage:"></asp:Label></td>
+        <td class="Normal"><wsp:Quota ID="quotaExchangeStorage" runat="server" QuotaName="Exchange2007.DiskSpace" DisplayGauge="True" /></td>
+    </tr>
     <tr ID="pnlMailAccounts" runat="server">
         <td class="SubHead" nowrap><asp:Label ID="lblMailAccounts" runat="server" meta:resourcekey="lblMailAccounts" Text="Mail Accounts:"></asp:Label></td>
         <td class="Normal"><wsp:Quota ID="quotaMailAccounts" runat="server" QuotaName="Mail.Accounts" DisplayGauge="True" /></td>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
index 173489f7..c3e77d55 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
@@ -59,14 +59,17 @@ namespace WebsitePanel.Portal
 			{ "quotaSubDomains", "pnlSubDomains" },
 			{ "quotaDomainPointers", "pnlDomainPointers" },
             { "quotaUserAccounts", "pnlUserAccounts" },
-			{ "quotaMailAccounts", "pnlMailboxes" },
+			{ "quotaMailAccounts", "pnlMailAccounts" },
+            { "quotaExchangeAccounts", "pnlExchangeAccounts" },
             { "quotaOCSUsers", "pnlOCSUsers" },
             { "quotaLyncUsers", "pnlLyncUsers" },
             { "quotaBlackBerryUsers", "pnlBlackBerryUsers" },
             { "quotaSharepointSites", "pnlSharepointSites" },
 			{ "quotaWebSites", "pnlWebSites" },
             { "quotaDatabases", "pnlDatabases" },
-			{ "quotaNumberOfVm", "pnlHyperVForPC" }
+			{ "quotaNumberOfVm", "pnlHyperVForPC" },
+            { "quotaFtpAccounts", "pnlFtpAccounts" },
+            { "quotaExchangeStorage", "pnlExchangeStorage" }
 		};
 
         protected void Page_Load(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
index f6478bd6..8ef05d08 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
@@ -174,6 +174,60 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.Quota quotaUserAccounts;
         
+        /// <summary>
+        /// pnlExchangeAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeAccounts;
+        
+        /// <summary>
+        /// lblExchangeAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblExchangeAccounts;
+        
+        /// <summary>
+        /// quotaExchangeAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota quotaExchangeAccounts;
+        
+        /// <summary>
+        /// pnlExchangeStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow pnlExchangeStorage;
+        
+        /// <summary>
+        /// lblExchangeStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblExchangeStorage;
+        
+        /// <summary>
+        /// quotaExchangeStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota quotaExchangeStorage;
+        
         /// <summary>
         /// pnlMailAccounts control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCustomers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCustomers.ascx.cs
index 9bcefaaa..6c8337c1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCustomers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCustomers.ascx.cs
@@ -64,6 +64,9 @@ namespace WebsitePanel.Portal
 					Utils.SelectListItem(ddlStatus, Request["StatusID"]);
 				if (Request["RoleID"] != null)
 					Utils.SelectListItem(ddlRole, Request["RoleID"]);
+
+
+                gvUsers.Sort("Username", System.Web.UI.WebControls.SortDirection.Ascending);
 			}
 		}