diff --git a/workflow/engine/classes/class.Installer_mssql.php b/workflow/engine/classes/class.Installer_mssql.php
index ba57f63df..f9aca5f92 100755
--- a/workflow/engine/classes/class.Installer_mssql.php
+++ b/workflow/engine/classes/class.Installer_mssql.php
@@ -62,7 +62,7 @@ class Installer
   
   function setServerData($psServer, $psPort, $psUserName, $psPassword )
   {
-    $this->server   = $psServer;
+    $this->server   = $psServer.':'.$psPort;
     $this->port     = $psPort;
     $this->userName = $psUserName;
     $this->password = $psPassword;
diff --git a/workflow/engine/methods/users/users_New.php b/workflow/engine/methods/users/users_New.php
index ab2e90ce6..ba5c19419 100644
--- a/workflow/engine/methods/users/users_New.php
+++ b/workflow/engine/methods/users/users_New.php
@@ -91,7 +91,7 @@ try {
   $_SESSION['_DBArray'] = $_DBArray;
 /////////////////////////////
 
-  
+   //var_dump($aFields);
   $G_PUBLISH             = new Publisher;
   $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save');
   G::RenderPage('publish','blank');
diff --git a/workflow/engine/methods/users/users_Save.php b/workflow/engine/methods/users/users_Save.php
index 1e119e8ec..5cf48f37b 100644
--- a/workflow/engine/methods/users/users_Save.php
+++ b/workflow/engine/methods/users/users_Save.php
@@ -73,6 +73,9 @@ try {
   if (!isset($form['USR_LOCATION'])) {
     $form['USR_LOCATION'] = '';
   }
+  if (!isset($form['USR_AUTH_USER_DN'])) {
+    $form['USR_AUTH_USER_DN'] = '';
+  }
   if ($form['USR_UID'] == '') {
     $aData['USR_USERNAME']    = $form['USR_USERNAME'];
     $aData['USR_PASSWORD']    = $form['USR_PASSWORD'];
@@ -83,6 +86,7 @@ try {
     $aData['USR_CREATE_DATE'] = date('Y-m-d H:i:s');
     $aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
     $aData['USR_BIRTHDAY']    = date('Y-m-d');
+    $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
     //fixing bug in inactive user when the admin create a new user.
     $statusWF = $form['USR_STATUS'];
     $aData['USR_STATUS']      = $form['USR_STATUS'] == 'ACTIVE' ? 1 : 0;
@@ -100,6 +104,7 @@ try {
     $aData['USR_RESUME']      = $form['USR_RESUME'];
     $aData['USR_ROLE']        = $form['USR_ROLE'];
     $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
+    
 
     require_once 'classes/model/Users.php';
     $oUser = new Users();
@@ -231,6 +236,9 @@ try {
     if(isset($form['USR_REPLACED_BY'])){
       $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];      
     }
+    if(isset($form['USR_AUTH_USER_DN'])){
+      $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
+    }
     
     require_once 'classes/model/Users.php';
     $oUser = new Users();
diff --git a/workflow/engine/xmlform/users/users_New.xml b/workflow/engine/xmlform/users/users_New.xml
index 87c02b9b0..5f2eb866c 100644
--- a/workflow/engine/xmlform/users/users_New.xml
+++ b/workflow/engine/xmlform/users/users_New.xml
@@ -80,7 +80,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
     </en>
   </USR_STATUS>
   <USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0">
-SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC
+SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY ROL_CODE 
   <en>Role</en>
   </USR_ROLE>
   <TITLE2 type="title" group="1">