diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
index 5d2afd8..a60f34a 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
@@ -10,90 +10,84 @@
 require_once("../../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
-	require_once("addUserUI.inc");
-	require_once("$default->fileSystemRoot/lib/users/User.inc");
-	require_once("$default->fileSystemRoot/lib/security/permission.inc");
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
-	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-	require_once("$default->fileSystemRoot/presentation/Html.inc");
-	
-	$oPatternCustom = & new PatternCustom();
-	//create db object
-    	$oDbAuth = new $default->authenticationClass;
-    	
-	if (isset($fSearch)) {
-	
-	//get user name
-	$sSearch = $fName;	 
-    	
-    	// user attributes to search for
-    		if ($default->authenticationClass == "DBAuthenticator") 	{
-    		    	$aAttributes = array ("username", "name", "email", "mobile", "email_notification", "sms_notification");
-    		    	$aResults = $oDbAuth->searchUsers($sSearch, $aAttributes);
-    		    	$bLdap = false;
-    		}else{
-    		//if its using LDAP get these attributes
-    	 		$aAttributes = array ("dn", "uid", "givenname", "sn", "mail", "mobile");
-    	 		$aResults = $oDbAuth->searchUsers($sSearch, $aAttributes);
-    	 		$bLdap = true;
-    		}
-     		//post array to page
-    		if(isset($aResults))
-    		{	
-    			if(count($aResults)== 0){
-    			
-    					$oPatternCustom->setHtml(getPageUsernameNotFound());
-    			}
-    			else{
-    			
-    				if($bLdap == false){
-					$oPatternCustom->setHtml(getDetailsDBPage($sSearch,$aResults));
-					$main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1&fFromDb=1");
-				}else{
-					$oPatternCustom->setHtml(getDetailsLDAPPage($sSearch,$aResults));
-					$main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1");
-				}
-			}
-			
-		}else{
-			$oPatternCustom->setHtml(getAddPageFail());
-			$main->setFormAction($_SERVER["PHP_SELF"]);
-		}
-		
-		
-	}else {
-		// if nothing happens...just reload edit page
-		$oPatternCustom->setHtml(getAddPage(null));
-		$main->setFormAction($_SERVER["PHP_SELF"]. "?fSearch=1");
-			
-	}		
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
+    require_once("addUserUI.inc");
+    require_once("$default->fileSystemRoot/lib/users/User.inc");
+    require_once("$default->fileSystemRoot/lib/security/permission.inc");
+    require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+    require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+    require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+    require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+    require_once("$default->fileSystemRoot/presentation/Html.inc");
 
+    $oPatternCustom = & new PatternCustom();
+    //create db object
+    $oDbAuth = new $default->authenticationClass;
 
-	if(isset($fAddToDb))
-	{	//if db authentication
-		if(isset($fFromDb)){
-			
-			//User($sNewUserName, $sNewName, $sNewPassword, $iNewQuotaMax, $sNewEmail, $sNewMobile, $bNewEmailNotification, $bNewSmsNotification, $sNewLdapDn, $iNewMaxSessions, $iNewLanguageID) 
-			$oUser = new User($fUsername,$fName,0,0,$fEmail,$fMobile,$fEmailNotification,$fSmsNotification,0,0,0);
-			
-		}else{
-			$oUser = new User($fUsername,$fName,0,0,$fEmail,$fMobile,0,0,$fLdap,0,0);
-		}
-		
-		if($oUser->create()){
-			$oPatternCustom->setHtml(getPageSuccess());
-		}
-		else{
-			$oPatternCustom->setHtml(getPageFail());
-		}	
-	}
-	
-	//$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addUnitSuccess&fUnit"));
-	$main->setCentralPayload($oPatternCustom);
-	$main->render();
+    if (isset($fSearch)) {
+        //get user name
+        $sSearch = $fName;
+
+        // user attributes to search for
+        if ($default->authenticationClass == "DBAuthenticator")  {
+            $aAttributes = array ("username", "name", "email", "mobile", "email_notification", "sms_notification");
+            $aResults = $oDbAuth->searchUsers($sSearch, $aAttributes);
+            $bLdap = false;
+        } else {
+            //if its using LDAP get these attributes
+            $aAttributes = array ("dn", "uid", "givenname", "sn", "mail", "mobile");
+            $aResults = $oDbAuth->searchUsers($sSearch, $aAttributes);
+            $bLdap = true;
+        }
+        //post array to page
+        if(isset($aResults)) {
+            if(count($aResults) == 0) {
+                $oPatternCustom->setHtml(getPageUsernameNotFound());
+            } else {
+                if (count($aResults) > 1) {
+                    // display results in a listbox                    
+                    $oPatternCustom->setHtml(getSelectUserPage($aResults));
+                    $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1&fFromDb=1&fSearch=1");
+                } else {
+                    if($bLdap == false) {
+                        $oPatternCustom->setHtml(getDetailsDBPage($sSearch,$aResults));
+                        $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1&fFromDb=1");
+                    } else {
+                        $oPatternCustom->setHtml(getDetailsLDAPPage($sSearch,$aResults));
+                        $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1");
+                    }
+                }
+            }
+
+        } else {
+            $oPatternCustom->setHtml(getAddPageFail());
+            $main->setFormAction($_SERVER["PHP_SELF"]);
+        }
+    } else if(isset($fAddToDb)) { //if db authentication
+        if(isset($fFromDb)) {
+
+            //User($sNewUserName, $sNewName, $sNewPassword, $iNewQuotaMax, $sNewEmail, $sNewMobile, $bNewEmailNotification, $bNewSmsNotification, $sNewLdapDn, $iNewMaxSessions, $iNewLanguageID)
+            $oUser = new User($fUsername,$fName,0,0,$fEmail,$fMobile,$fEmailNotification,$fSmsNotification,0,1,0);
+
+        } else {
+            $oUser = new User($fUsername,$fName,0,0,$fEmail,$fMobile,1,0,$fLdap,1,0);
+        }
+
+        if($oUser->create()) {
+            $oPatternCustom->setHtml(getPageSuccess());
+        } else {
+            $oPatternCustom->setHtml(getPageFail());
+        }
+    } else {
+        // if nothing happens...just reload edit page
+        $oPatternCustom->setHtml(getAddPage(null));
+        $main->setFormAction($_SERVER["PHP_SELF"]. "?fSearch=1");
+
+    }
+
+    //$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addUnitSuccess&fUnit"));
+    $main->setCentralPayload($oPatternCustom);
+    $main->render();
 }
 ?>