diff --git a/js/server_privileges.js b/js/server_privileges.js
index 1e474fe9a..4bc8ae7bf 100755
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -279,6 +279,54 @@ $(document).ready(function() {
             if(data.success == true) {
                 PMA_ajaxShowMessage(data.message);
                 $("#edit_user_dialog").dialog("close").remove();
+
+                if(data.sql_query) {
+                    $("#topmenucontainer")
+                    .next('div')
+                    .remove()
+                    .end()
+                    .after(data.sql_query);
+                    var notice_class = $("#topmenucontainer").next("div").find('.notice');
+                    if($(notice_class).text() == '') {
+                        $(notice_class).remove();
+                    }
+                }
+
+                if(data.new_user_string) {
+                    //Append the newly retrived user to the table now
+
+                    //Calculate the index for the new row
+                    var curr_last_row = $("#usersForm").find('tbody').find('tr:last');
+                    var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0];
+                    var curr_last_row_index = parseFloat(curr_last_row_index_string);
+                    var new_last_row_index = curr_last_row_index + 1;
+                    var new_last_row_id = 'checkbox_sel_users_' + new_last_row_index;
+
+                    //Append to the table and set the id/names correctly
+                    $(data.new_user_string)
+                    .insertAfter($(curr_last_row))
+                    .find('input:checkbox')
+                    .attr('id', new_last_row_id)
+                    .val(function() {
+                        //the insert messes up the &27; part. let's fix it
+                        return $(this).val().replace(/&/,'&');
+                    })
+                    .end()
+                    .find('label')
+                    .attr('for', new_last_row_id)
+                    .end();
+
+                    //Re-check the classes of each row
+                    $("#usersForm")
+                    .find('tbody').find('tr:odd')
+                    .removeClass('even').addClass('odd')
+                    .end()
+                    .find('tr:even')
+                    .removeClass('odd').addClass('even');
+
+                    $("#initials_table").find('td:contains('+data.new_user_initial+')')
+                    .html(data.new_user_initial_string);
+                }
             }
             else {
                 PMA_ajaxShowMessage(data.error);
diff --git a/server_privileges.php b/server_privileges.php
index 695f00538..397190663 100755
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1375,7 +1375,7 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && !isset($_REQUE
     if(isset($sql_query)) {
         $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
     }
-    if(isset($_REQUEST['adduser_submit'])) {
+    if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         //generate html on the fly for the new user that was just created.
         $new_user_string = '<tr>'."\n"
                            .'<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_" value="' . htmlspecialchars($username) . '&amp;#27;' . htmlspecialchars($hostname) . '" /> </td>'."\n"