diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
index c30c70aa..44556807 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
@@ -310,25 +310,25 @@ namespace WebsitePanel.EnterpriseServer
                         // error while creating mail account
                         throw new Exception("Could not create mail account", ex);
                     }
+                }
 
-                    // Instant Alias / Temporary URL
-                    if (tempDomain && (domainId > 0))
+                // Instant Alias / Temporary URL
+                if (tempDomain && (domainId > 0))
+                {
+                    int instantAliasId = ServerController.CreateDomainInstantAlias("", domainId);
+                    if (instantAliasId < 0)
                     {
-                        int instantAliasId = ServerController.CreateDomainInstantAlias("", domainId);
-                        if (instantAliasId < 0)
-                        {
-                            // rollback wizard
-                            Rollback();
+                        // rollback wizard
+                        Rollback();
 
-                            return instantAliasId;
-                        }
+                        return instantAliasId;
                     }
+                }
 
-                    // Domain DNS Zone
-                    if (createZoneRecord && (domainId > 0))
-                    {
-                        ServerController.EnableDomainDns(domainId);
-                    }
+                // Domain DNS Zone
+                if (createZoneRecord && (domainId > 0))
+                {
+                    ServerController.EnableDomainDns(domainId);
                 }
             }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/SmarterMail10.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/SmarterMail10.cs
index 97ece705..2fd4a4d7 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/SmarterMail10.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail10/SmarterMail10.cs
@@ -200,29 +200,23 @@ namespace WebsitePanel.Providers.Mail
 				{
 					try
 					{
+                        svcUserAdmin users = new svcUserAdmin();
+                        PrepareProxy(users);
 
-						// get mailbox size
-						string name = item.Name;
+                        StatInfoResult userStats = users.GetUserStats(AdminUsername, AdminPassword, item.Name, DateTime.Now, DateTime.Now);
+                        if (!userStats.Result)
+                        {
+                            throw new Exception(userStats.Message);
+                        }
 
-						// try to get SmarterMail postoffices path
-						string poPath = DomainsPath;
-						if (poPath == null)
-							continue;
-
-						string mailboxName = name.Substring(0, name.IndexOf("@"));
-						string domainName = name.Substring(name.IndexOf("@") + 1);
-
-						string mailboxPath = Path.Combine(DomainsPath, String.Format("{0}\\Users\\{1}", domainName, mailboxName));
-
-						Log.WriteStart(String.Format("Calculating '{0}' folder size", mailboxPath));
-
-						// calculate disk space
-						ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
-						diskspace.ItemId = item.Id;
-						//diskspace.DiskSpace = 0;
-						diskspace.DiskSpace = FileUtils.CalculateFolderSize(mailboxPath);
-						itemsDiskspace.Add(diskspace);
-						Log.WriteEnd(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
+                        // calculate disk space
+                        ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
+                        diskspace.ItemId = item.Id;
+                        //diskspace.DiskSpace = 0;
+                        diskspace.DiskSpace = userStats.BytesSize;
+                        itemsDiskspace.Add(diskspace);
+                        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
 					}
 					catch (Exception ex)
 					{
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail5/SmarterMail5.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail5/SmarterMail5.cs
index 56e8cb21..2433bff8 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail5/SmarterMail5.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail5/SmarterMail5.cs
@@ -1570,29 +1570,23 @@ namespace WebsitePanel.Providers.Mail
                 {
                     try
                     {
+                        svcUserAdmin users = new svcUserAdmin();
+                        PrepareProxy(users);
 
-                        // get mailbox size
-                        string name = item.Name;
-
-                        // try to get SmarterMail postoffices path
-                        string poPath = DomainsPath;
-                        if (poPath == null)
-                            continue;
-
-                        string mailboxName = name.Substring(0, name.IndexOf("@"));
-                        string domainName = name.Substring(name.IndexOf("@") + 1);
-
-                        string mailboxPath = Path.Combine(DomainsPath, String.Format("{0}\\Users\\{1}", domainName, mailboxName));
-
-                        Log.WriteStart(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        StatInfoResult userStats = users.GetUserStats(AdminUsername, AdminPassword, item.Name, DateTime.Now, DateTime.Now);
+                        if (!userStats.Result)
+                        {
+                            throw new Exception(userStats.Message);
+                        }
 
+                        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
                         // calculate disk space
                         ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
                         diskspace.ItemId = item.Id;
                         //diskspace.DiskSpace = 0;
-                        diskspace.DiskSpace = FileUtils.CalculateFolderSize(mailboxPath);
+                        diskspace.DiskSpace = userStats.BytesSize;
                         itemsDiskspace.Add(diskspace);
-                        Log.WriteEnd(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
                     }
                     catch (Exception ex)
                     {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail6/SmarterMail6.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail6/SmarterMail6.cs
index cfa88210..64a3369d 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail6/SmarterMail6.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail6/SmarterMail6.cs
@@ -200,29 +200,23 @@ namespace WebsitePanel.Providers.Mail
                 {
                     try
                     {
+                        svcUserAdmin users = new svcUserAdmin();
+                        PrepareProxy(users);
 
-                        // get mailbox size
-                        string name = item.Name;
-
-                        // try to get SmarterMail postoffices path
-                        string poPath = DomainsPath;
-                        if (poPath == null)
-                            continue;
-
-                        string mailboxName = name.Substring(0, name.IndexOf("@"));
-                        string domainName = name.Substring(name.IndexOf("@") + 1);
-
-                        string mailboxPath = Path.Combine(DomainsPath, String.Format("{0}\\Users\\{1}", domainName, mailboxName));
-
-                        Log.WriteStart(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        StatInfoResult userStats = users.GetUserStats(AdminUsername, AdminPassword, item.Name, DateTime.Now, DateTime.Now);
+                        if (!userStats.Result)
+                        {
+                            throw new Exception(userStats.Message);
+                        }
 
+                        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
                         // calculate disk space
                         ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
                         diskspace.ItemId = item.Id;
                         //diskspace.DiskSpace = 0;
-                        diskspace.DiskSpace = FileUtils.CalculateFolderSize(mailboxPath);
+                        diskspace.DiskSpace = userStats.BytesSize;
                         itemsDiskspace.Add(diskspace);
-                        Log.WriteEnd(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
                     }
                     catch (Exception ex)
                     {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail7/SmarterMail7.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail7/SmarterMail7.cs
index 5f6df0b4..7d5d69a0 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail7/SmarterMail7.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail7/SmarterMail7.cs
@@ -200,29 +200,23 @@ namespace WebsitePanel.Providers.Mail
 				{
 					try
 					{
+                        svcUserAdmin users = new svcUserAdmin();
+                        PrepareProxy(users);
 
-						// get mailbox size
-						string name = item.Name;
+                        StatInfoResult userStats = users.GetUserStats(AdminUsername, AdminPassword, item.Name, DateTime.Now, DateTime.Now);
+                        if (!userStats.Result)
+                        {
+                            throw new Exception(userStats.Message);
+                        }
 
-						// try to get SmarterMail postoffices path
-						string poPath = DomainsPath;
-						if (poPath == null)
-							continue;
-
-						string mailboxName = name.Substring(0, name.IndexOf("@"));
-						string domainName = name.Substring(name.IndexOf("@") + 1);
-
-						string mailboxPath = Path.Combine(DomainsPath, String.Format("{0}\\Users\\{1}", domainName, mailboxName));
-
-						Log.WriteStart(String.Format("Calculating '{0}' folder size", mailboxPath));
-
-						// calculate disk space
-						ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
-						diskspace.ItemId = item.Id;
-						//diskspace.DiskSpace = 0;
-						diskspace.DiskSpace = FileUtils.CalculateFolderSize(mailboxPath);
-						itemsDiskspace.Add(diskspace);
-						Log.WriteEnd(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
+                        // calculate disk space
+                        ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
+                        diskspace.ItemId = item.Id;
+                        //diskspace.DiskSpace = 0;
+                        diskspace.DiskSpace = userStats.BytesSize;
+                        itemsDiskspace.Add(diskspace);
+                        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
 					}
 					catch (Exception ex)
 					{
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail9/SmarterMail9.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail9/SmarterMail9.cs
index 3ce85581..4a1bbde2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail9/SmarterMail9.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.SmarterMail9/SmarterMail9.cs
@@ -200,29 +200,23 @@ namespace WebsitePanel.Providers.Mail
                 {
                     try
                     {
+                        svcUserAdmin users = new svcUserAdmin();
+                        PrepareProxy(users);
 
-                        // get mailbox size
-                        string name = item.Name;
-
-                        // try to get SmarterMail postoffices path
-                        string poPath = DomainsPath;
-                        if (poPath == null)
-                            continue;
-
-                        string mailboxName = name.Substring(0, name.IndexOf("@"));
-                        string domainName = name.Substring(name.IndexOf("@") + 1);
-
-                        string mailboxPath = Path.Combine(DomainsPath, String.Format("{0}\\Users\\{1}", domainName, mailboxName));
-
-                        Log.WriteStart(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        StatInfoResult userStats = users.GetUserStats(AdminUsername, AdminPassword, item.Name, DateTime.Now, DateTime.Now);
+                        if (!userStats.Result)
+                        {
+                            throw new Exception(userStats.Message);
+                        }
 
+                        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
                         // calculate disk space
                         ServiceProviderItemDiskSpace diskspace = new ServiceProviderItemDiskSpace();
                         diskspace.ItemId = item.Id;
                         //diskspace.DiskSpace = 0;
-                        diskspace.DiskSpace = FileUtils.CalculateFolderSize(mailboxPath);
+                        diskspace.DiskSpace = userStats.BytesSize;
                         itemsDiskspace.Add(diskspace);
-                        Log.WriteEnd(String.Format("Calculating '{0}' folder size", mailboxPath));
+                        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
                     }
                     catch (Exception ex)
                     {