thurt
diff --git a/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
Lines changed: 33 additions & 5 deletions b/‎js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
Lines changed: 33 additions & 5 deletions
@@ -145,13 +145,21 @@
     },
 
     submitCreateDatabase: function() {
-      var self = this;
-      var name  = $('#newDatabaseName').val();
-      var userName = $('#newUser').val();
-      var userPassword = $('#newPassword').val();
+      var self = this, userPassword,
+      name  = $('#newDatabaseName').val(),
+      userName = $('#newUser').val();
+
+      if ($('#useDefaultPassword').val() === 'true') {
+        userPassword = 'ARANGODB_DEFAULT_ROOT_PASSWORD'; 
+      }
+      else {
+        userPassword = $('#newPassword').val();
+      }
+
       if (!this.validateDatabaseInfo(name, userName, userPassword)) {
         return;
       }
+
       var options = {
         name: name,
         users: [
@@ -334,11 +342,19 @@
           ]
         )
       );
+      tableContent.push(
+        window.modalView.createSelectEntry(
+          "useDefaultPassword",
+          "Use default password",
+          true,
+          "Read the password from the environment variable ARANGODB_DEFAULT_ROOT_PASSWORD.",
+          [{value: false, label: "No"}, {value: true, label: "Yes"}]        )
+      );
       tableContent.push(
         window.modalView.createPasswordEntry(
           "newPassword",
           "Password",
-          "ARANGODB_DEFAULT_ROOT_PASSWORD",
+          "",
           false,
           "",
           false
@@ -356,6 +372,18 @@
         buttons,
         tableContent
       );
+
+      $('#useDefaultPassword').change(function() {
+
+        if ($('#useDefaultPassword').val() === 'true') {
+          $('#row_newPassword').hide();
+        }
+        else {
+          $('#row_newPassword').show();
+        }
+      });
+
+      $('#row_newPassword').hide();
     }
 
   });