diff --git a/ChangeLog b/ChangeLog
index a5c2120f2b..4eded4e04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4405 Cannot import (open_basedir)
 - bug #4396 Problem copying constraints (such as Sakila)
 - bug #4433 Missing privileges submenu
+- bug #4394 Drop db confirmation message when dropping a user
 
 4.2.2.0 (2014-05-20)
 - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 88fddb64b0..1016a803c9 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -262,6 +262,15 @@ AJAX.registerOnload('server_privileges.js', function () {
     $("#fieldset_delete_user_footer #buttonGo.ajax").live('click', function (event) {
         event.preventDefault();
 
+        $drop_users_db_checkbox = $("#checkbox_drop_users_db");
+        if ($drop_users_db_checkbox.is(':checked')) {
+            var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + $.sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE'));
+            if (! is_confirmed) {
+                // Uncheck the drop users database checkbox
+                $drop_users_db_checkbox.prop('checked', false);
+            }
+        }
+
         PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
 
         var $form = $("#usersForm");
@@ -673,20 +682,6 @@ AJAX.registerOnload('server_privileges.js', function () {
         }); // end $.get
     }); // end of the paginate users table
 
-    /*
-     * Additional confirmation dialog after clicking
-     * 'Drop the databases...'
-     */
-    $('#checkbox_drop_users_db').click(function () {
-        var $this_checkbox = $(this);
-        if ($this_checkbox.is(':checked')) {
-            var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + $.sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE'));
-            if (! is_confirmed) {
-                $this_checkbox.prop('checked', false);
-            }
-        }
-    });
-
     displayPasswordGenerateButton();
 
     /*