diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/hMailServer43_EditAccount.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/hMailServer43_EditAccount.ascx.cs
index b5958f1c..73989b3c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/hMailServer43_EditAccount.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/hMailServer43_EditAccount.ascx.cs
@@ -67,7 +67,9 @@ namespace WebsitePanel.Portal.ProviderControls
 			item.ResponderEnabled = chkResponderEnabled.Checked;
 			item.ResponderSubject = txtSubject.Text;
 			item.ResponderMessage = txtMessage.Text;
-			item.ForwardingAddresses = new string[] { txtForward.Text };
+            if (txtForward.Text.Length > 0) {
+			    item.ForwardingAddresses = new string[] { txtForward.Text };
+            }
             item.RetainLocalCopy = chkOriginalMessage.Checked;
             item.FirstName = txtFirstName.Text;
             item.LastName = txtLastName.Text;