diff --git a/ChangeLog b/ChangeLog
index 48fffe7c07..73087d2f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 - issue #12964 Fixed table search in navigation
 - issue #12985 Fixed rendering of foreign key browsing
 - issue #12957 Fixed manipulation with GIS data having zero coordinates
+- issue #12804 Fixed various designer javascript errors
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/js/console.js b/js/console.js
index 8eb030b9f8..4101123ce1 100644
--- a/js/console.js
+++ b/js/console.js
@@ -193,8 +193,8 @@ var PMA_console = {
                     var data = JSON.parse(xhr.responseText);
                     PMA_console.ajaxCallback(data);
                 } catch (e) {
-                    console.log("Invalid JSON!" + e.message);
                     console.trace();
+                    console.log("Invalid JSON!" + e.message);
                     if (AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
                         PMA_ajaxShowMessage($('<div />',{'class':'error','html':PMA_messages.strRequestFailed+' ( '+escapeHtml(AJAX.xhr.statusText)+' )'}));
                         AJAX.active = false;
diff --git a/js/pmd/init.js b/js/pmd/init.js
index 47781256e4..bc4b1d680f 100644
--- a/js/pmd/init.js
+++ b/js/pmd/init.js
@@ -3,7 +3,7 @@
  * Initialises the data required to run PMD, then fires it up.
  */
 
-var j_tabs, h_tabs, contr, display_field, server, db, token, selected_page, pmd_tables_enabled;
+var j_tabs, h_tabs, contr, display_field, server, db, selected_page, pmd_tables_enabled;
 
 AJAX.registerTeardown('pmd/init.js', function () {
     $(".trigger").unbind('click');
@@ -25,7 +25,6 @@ AJAX.registerOnload('pmd/init.js', function () {
 
     server             = $("#script_server").html();
     db                 = $("#script_db").html();
-    token              = $("#script_token").html();
     selected_page      = $("#script_display_page").html() === "" ? "-1" : $("#script_display_page").html();
     pmd_tables_enabled = $("#pmd_tables_enabled").html() === "1";
 
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 5c109f0eb6..e8bcc85c88 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -642,7 +642,7 @@ function Save2(callback)
 {
     if (pmd_tables_enabled) {
         var poststr = '&operation=savePage&save_page=same&ajax_request=true';
-        poststr += '&server=' + server + '&db=' + db + '&token=' + token + '&selected_page=' + selected_page;
+        poststr += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + '&selected_page=' + selected_page;
         poststr += Get_url_pos();
 
         var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
@@ -729,7 +729,7 @@ function Save3(callback)
         var $form = $('<form action="db_designer.php" method="post" name="save_page" id="save_page" class="ajax"></form>')
             .append('<input type="hidden" name="server" value="' + server + '" />')
             .append('<input type="hidden" name="db" value="' + db + '" />')
-            .append('<input type="hidden" name="token" value="' + token + '" />')
+            .append('<input type="hidden" name="token" value="' + PMA_commonParams.get('token') + '" />')
             .append('<input type="hidden" name="operation" value="savePage" />')
             .append('<input type="hidden" name="save_page" value="new" />')
             .append('<label for="selected_value">' + PMA_messages.strPageName +
@@ -774,7 +774,7 @@ function Edit_pages()
         };
 
         var $msgbox = PMA_ajaxShowMessage();
-        var params = 'ajax_request=true&dialog=edit&server=' + server + '&token=' + token + '&db=' + db;
+        var params = 'ajax_request=true&dialog=edit&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
         $.get("db_designer.php", params, function (data) {
             if (data.success === false) {
                 PMA_ajaxShowMessage(data.error, false);
@@ -854,7 +854,7 @@ function Delete_pages()
     };
 
     var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=delete&server=' + server + '&token=' + token + '&db=' + db;
+    var params = 'ajax_request=true&dialog=delete&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
     $.get("db_designer.php", params, function (data) {
         if (data.success === false) {
             PMA_ajaxShowMessage(data.error, false);
@@ -953,7 +953,7 @@ function Save_as()
     };
 
     var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + token + '&db=' + db;
+    var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
     $.get("db_designer.php", params, function (data) {
         if (data.success === false) {
             PMA_ajaxShowMessage(data.error, false);
@@ -1030,7 +1030,7 @@ function Export_pages()
         $(this).dialog('close');
     };
     var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=export&server=' + server + '&token=' + token + '&db=' + db + '&selected_page=' + selected_page;
+    var params = 'ajax_request=true&dialog=export&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db + '&selected_page=' + selected_page;
     $.get("db_designer.php", params, function (data) {
         if (data.success === false) {
             PMA_ajaxShowMessage(data.error, false);
@@ -1077,7 +1077,7 @@ function Load_page(page) {
         if (page !== null) {
             param_page = '&page=' + page;
         }
-        $('<a href="db_designer.php?server=' + server + '&db=' + db + '&token=' + token + param_page + '"></a>')
+        $('<a href="db_designer.php?server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + param_page + '"></a>')
             .appendTo($('#page_content'))
             .click();
     } else {
@@ -1125,7 +1125,7 @@ function Angular_direct()
 
 function saveValueInConfig(index_sent, value_sent) {
     $.post('db_designer.php',
-        {operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, token: token, value: value_sent},
+        {operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, token: PMA_commonParams.get('token'), value: value_sent},
         function (data) {
         if (data.success === false) {
             PMA_ajaxShowMessage(data.error, false);
@@ -1205,7 +1205,7 @@ function Click_field(T, f, PK) // table field
 
         var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
         $.post('db_designer.php',
-            {operation: 'setDisplayField', ajax_request: true, server: server, token: token, db: db, table: T, field: f},
+            {operation: 'setDisplayField', ajax_request: true, server: server, token: PMA_commonParams.get('token'), db: db, table: T, field: f},
             function (data) {
             if (data.success === false) {
                 PMA_ajaxShowMessage(data.error, false);
@@ -1220,7 +1220,7 @@ function Click_field(T, f, PK) // table field
 function New_relation()
 {
     document.getElementById('layer_new_relation').style.display = 'none';
-    link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
+    link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token');
     link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
     link_relation += '&operation=addNewRelation&ajax_request=true';
 
@@ -1451,7 +1451,7 @@ function Canvas_click(id, event)
 function Upd_relation()
 {
     document.getElementById('layer_upd_relation').style.display = 'none';
-    link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
+    link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token');
     link_relation += '&operation=removeRelation&ajax_request=true';
 
     var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
diff --git a/templates/database/designer/js_fields.phtml b/templates/database/designer/js_fields.phtml
index 5e6338836f..a8c069f90c 100644
--- a/templates/database/designer/js_fields.phtml
+++ b/templates/database/designer/js_fields.phtml
@@ -2,9 +2,8 @@
 <!-- Do not expand HTML here, invisible characters will make javascript crash -->
 <div id="script_server" class="hide"><?= htmlspecialchars($GLOBALS['server']); ?></div>
 <div id="script_db" class="hide"><?= htmlspecialchars($_GET['db']); ?></div>
-<div id="script_token" class="hide"><?= htmlspecialchars($_GET['token']); ?></div>
 <div id="script_tables" class="hide"><?= htmlspecialchars(json_encode($script_tables)); ?></div>
 <div id="script_contr" class="hide"><?= htmlspecialchars(json_encode($script_contr)); ?></div>
 <div id="script_display_field" class="hide"><?= htmlspecialchars(json_encode($script_display_field)); ?></div>
 <div id="script_display_page" class="hide"><?= htmlspecialchars($display_page); ?></div>
-<div id="pmd_tables_enabled" class="hide"><?= htmlspecialchars($cfgRelation['pdfwork']); ?></div>
\ No newline at end of file
+<div id="pmd_tables_enabled" class="hide"><?= htmlspecialchars($cfgRelation['pdfwork']); ?></div>