diff --git a/ChangeLog b/ChangeLog
index 60985a147..3a7d64ff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,6 +129,7 @@
   table even when phpMyAdmin configuration storage is not active
 - bug #3141327 [relation] Foreign key input options
 - [export] Better handling of export to PHP array.
+- rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user
 
 3.3.10.0 (not yet released)
 - patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/js/server_privileges.js b/js/server_privileges.js
index f2458f792..e85e2cc21 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -209,6 +209,9 @@ $(document).ready(function() {
             .dialog({
                 title: PMA_messages['strAddNewUser'],
                 width: 800,
+                // height is a workaround for this Chrome problem:
+                // http://bugs.jqueryui.com/ticket/4671
+                height: 700,
                 modal: true,
                 buttons: button_options
             }); //dialog options end
@@ -440,6 +443,20 @@ $(document).ready(function() {
         }) // end $.get
     })// end of the paginate users table
 
+    /*
+     * Additional confirmation dialog after clicking 
+     * 'Drop the databases...'
+     */
+    $('#checkbox_drop_users_db').click(function() {
+        $this_checkbox = $(this);
+        if ($this_checkbox.is(':checked')) {
+            var is_confirmed = confirm(PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\nDROP DATABASE');
+            if (! is_confirmed) {
+                $this_checkbox.attr('checked', false);
+            }
+        }
+    });
+
 }, 'top.frame_content'); //end $(document).ready()
 
 /**#@- */