diff --git a/deployment/deployutils/deployutils.cpp b/deployment/deployutils/deployutils.cpp
index 0b17b035126..bc1a5f2c8bf 100644
--- a/deployment/deployutils/deployutils.cpp
+++ b/deployment/deployutils/deployutils.cpp
@@ -1654,6 +1654,26 @@ class CGenerateJSFromXSD
             }
           }
         }
+        else if(!strcmp(type,"serverListType"))
+        {
+          if(m_wizard)
+          {
+            StringBuffer buildSetName, ipAddr;
+            tempPath.clear().appendf("./Programs/Build/BuildSet[%s=\"%s\"]",XML_ATTR_PROCESS_NAME,m_compName.str());
+            IPropertyTree* pCompTree = m_pEnv->queryPropTree(tempPath.str());
+            if(pCompTree)
+            {
+              buildSetName.append(pCompTree->queryProp(XML_ATTR_NAME));
+              CInstDetails* pInst  = m_wizard->getServerIPMap(compName, buildSetName,m_pEnv);
+              if( pInst )
+              {
+                StringArray& ipArray = pInst->getIpAssigned();
+                if(ipArray.length())
+                  wizDefVal.clear().append(ipArray.item(0));
+              }
+            }
+          }
+        }
         else if(!strcmp(type,"xs:string"))
         {
           StringBuffer nameOfComp;
diff --git a/initfiles/componentfiles/configxml/dropzone.xsd.in b/initfiles/componentfiles/configxml/dropzone.xsd.in
index 299c6b66d6e..33be41f36bc 100644
--- a/initfiles/componentfiles/configxml/dropzone.xsd.in
+++ b/initfiles/componentfiles/configxml/dropzone.xsd.in
@@ -99,12 +99,13 @@
                             <xs:element name="ServerListEntry" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         </xs:sequence>
                     </xs:complexType>
-                    <xs:attribute name="server" type="string" use="required">
+                    <xs:attribute name="server" type="serverListType" use="required">
                         <xs:annotation>
                             <xs:appinfo>
                                 <title>Server Address</title>
                                 <tooltip>Server Address to associate with this DropZone</tooltip>
                                 <width>120</width>
+                                <autogenforwizard>1</autogenforwizard>
                             </xs:appinfo>
                         </xs:annotation>
                     </xs:attribute>