diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index 14b58a56fa..3ed8b0b29a 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -642,10 +642,8 @@ function buildUserJSON(dialog){
 
     if (driver == 'custom'){
         driver = $('input[name="custom_auth"]', dialog).val();
-    }
-
-    if (!user_name.length || !user_password.length){
-        return false;
+    } else if (driver == "ldap") {
+        user_password = "-"
     }
 
     var user_json = { "user" :
@@ -670,6 +668,16 @@ function setupCreateUserDialog(){
 
     //$('button',dialog).button();
 
+    $('#driver', dialog).change(function(){
+        if ($(this).val() == "ldap"){
+            $('#pass',dialog).hide();
+            $('label[for="pass"]',dialog).hide();
+        } else {
+            $('#pass',dialog).show();
+            $('label[for="pass"]',dialog).show();
+        };
+    });
+
     setupCustomAuthDialog(dialog);
 
     $('#create_user_form',dialog).submit(function(){