diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
index ca625b5c..d16da4d3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
@@ -2490,7 +2490,7 @@ namespace WebsitePanel.EnterpriseServer
 				WebServer server = GetWebServer(item.ServiceId);
 
                 StringDictionary webSettings = ServerController.GetServiceSettings(item.ServiceId);
-                if (webSettings["WmSvc.NETBIOS"] != null)
+                if (!String.IsNullOrEmpty(webSettings["WmSvc.NETBIOS"]))
                 {
                     accountName = webSettings["WmSvc.NETBIOS"].ToString() + "\\" + accountName;
                 }
@@ -3258,7 +3258,7 @@ namespace WebsitePanel.EnterpriseServer
 				WebServer server = GetWebServer(item.ServiceId);
 
                 StringDictionary webSettings = ServerController.GetServiceSettings(item.ServiceId);
-                if (webSettings["WmSvc.NETBIOS"] != null)
+                if (!String.IsNullOrEmpty(webSettings["WmSvc.NETBIOS"]))
                 {
                     accountName = webSettings["WmSvc.NETBIOS"].ToString() + "\\" + accountName;
                 }