diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 85f88de1..8407d50b 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -6180,7 +6180,13 @@ GO
 
 IF NOT EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME' )
 BEGIN
-INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [DefaultValue], [ParameterOrder]) VALUES (N'SCHEDULE_TASK_DOMAIN_LOOKUP', N'SERVER_NAME', N'String', NULL, 3)
+INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [DefaultValue], [ParameterOrder]) VALUES (N'SCHEDULE_TASK_DOMAIN_LOOKUP', N'SERVER_NAME', N'String', N'', 3)
+END
+GO
+
+IF EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME' )
+BEGIN
+UPDATE [dbo].[ScheduleTaskParameters] SET [DefaultValue] = N'' WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME'
 END
 GO
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx
index 7034bce6..8655355c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx
@@ -6,7 +6,8 @@
 			<asp:Label ID="lblServerName" runat="server" meta:resourcekey="lblServerName">Server Name: </asp:Label>
 		</td>
         <td class="Normal" width="100%">
-   			<asp:TextBox ID="txtServerName" runat="server" Width="95%" CssClass="NormalTextBox" MaxLength="1000"></asp:TextBox>
+            <asp:DropDownList ID="ddlServers" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" />
+        </td>
     </tr>
     <tr>
         <td class="SubHead" nowrap>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs
index 8e6dc106..e03b5a49 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs
@@ -30,7 +30,33 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
 
             this.SetParameter(this.txtDnsServers, DnsServersParameter);
             this.SetParameter(this.txtMailTo, MailToParameter);
-            this.SetParameter(this.txtServerName, ServerNameParameter);
+            this.SetParameter(this.ddlServers, ServerNameParameter);
+
+            var servers = ES.Services.Servers.GetAllServers();
+
+            var osGroup = ES.Services.Servers.GetResourceGroups().First(x => x.GroupName == ResourceGroups.Os);
+            var osProviders = ES.Services.Servers.GetProvidersByGroupId(osGroup.GroupId);
+
+            var osServers = new List<ServerInfo>();
+
+            foreach (var server in servers)
+            {
+                var services = ES.Services.Servers.GetServicesByServerId(server.ServerId);
+
+                if (services.Any(x => osProviders.Any(p=>p.ProviderId  == x.ProviderId)))
+                {
+                    osServers.Add(server);
+                }
+            }
+
+            ddlServers.DataSource = osServers.Select(x => new { Id = x.ServerName, Name = x.ServerName });
+            ddlServers.DataTextField = "Name";
+            ddlServers.DataValueField = "Id";
+            ddlServers.DataBind();
+
+            ScheduleTaskParameterInfo parameter = this.FindParameterById(ServerNameParameter);
+
+            ddlServers.SelectedValue = parameter.ParameterValue;
         }
 
         /// <summary>
@@ -41,7 +67,7 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
         {
             ScheduleTaskParameterInfo dnsServers = this.GetParameter(this.txtDnsServers, DnsServersParameter);
             ScheduleTaskParameterInfo mailTo = this.GetParameter(this.txtMailTo, MailToParameter);
-            ScheduleTaskParameterInfo serverName = this.GetParameter(this.txtServerName, ServerNameParameter);
+            ScheduleTaskParameterInfo serverName = this.GetParameter(this.ddlServers, ServerNameParameter);
 
             return new ScheduleTaskParameterInfo[3] { dnsServers, mailTo, serverName };
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs
index cfc285be..df689cac 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs
@@ -22,13 +22,13 @@ namespace WebsitePanel.Portal.ScheduleTaskControls {
         protected global::System.Web.UI.WebControls.Label lblServerName;
         
         /// <summary>
-        /// txtServerName control.
+        /// ddlServers 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.TextBox txtServerName;
+        protected global::System.Web.UI.WebControls.DropDownList ddlServers;
         
         /// <summary>
         /// lblDnsServers control.