diff --git a/ChangeLog b/ChangeLog
index 82f820fca2..e8b428d647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@ phpMyAdmin - ChangeLog
 - issue #12413 Fixed deleting users in non English locales
 - issue #12416 Fixed replication status output in Databases listing
 - issue #12303 Avoid typecasting to float when not needed
+- issue #12425 Duplicate message variable names in messages.inc.php
+- issue #12399 Adding index to table shows wrong top navigation
 
 4.6.3 (2016-06-23)
 - issue #12249 Fixed cookie path on Windows
diff --git a/import.php b/import.php
index 5425dcc287..39db9643a6 100644
--- a/import.php
+++ b/import.php
@@ -636,10 +636,14 @@ if ($sqlLength <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
     list(
         $analyzed_sql_results,
         $db,
-        $table
+        $table_from_sql
     ) = PMA_parseAnalyze($sql_query, $db);
     // @todo: possibly refactor
     extract($analyzed_sql_results);
+
+    if ($table != $table_from_sql && !empty($table_from_sql)) {
+        $table = $table_from_sql;
+    }
 }
 
 // There was an error?
@@ -668,11 +672,15 @@ if ($go_sql) {
         list(
             $analyzed_sql_results,
             $db,
-            $table
+            $table_from_sql
         ) = PMA_parseAnalyze($sql_query, $db);
         // @todo: possibly refactor
         extract($analyzed_sql_results);
 
+        if ($table != $table_from_sql && !empty($table_from_sql)) {
+            $table = $table_from_sql;
+        }
+
         $html_output .= PMA_executeQueryAndGetQueryResponse(
             $analyzed_sql_results, // analyzed_sql_results
             false, // is_gotofile
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index cedd25a821..9884440b1f 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -2035,10 +2035,14 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
         list(
             $analyzed_sql_results,
             $db,
-            $table
+            $table_from_sql
         ) = PMA_parseAnalyze($sql_query, $db);
         // @todo: possibly refactor
         extract($analyzed_sql_results);
+
+        if ($table != $table_from_sql && !empty($table_from_sql)) {
+            $table = $table_from_sql;
+        }
     }
 
     $html_output = PMA_executeQueryAndGetQueryResponse(
diff --git a/sql.php b/sql.php
index 6e22d62b0e..6e6257b732 100644
--- a/sql.php
+++ b/sql.php
@@ -141,11 +141,15 @@ require_once 'libraries/parse_analyze.lib.php';
 list(
     $analyzed_sql_results,
     $db,
-    $table
+    $table_from_sql
 ) = PMA_parseAnalyze($sql_query, $db);
 // @todo: possibly refactor
 extract($analyzed_sql_results);
 
+if ($table != $table_from_sql && !empty($table_from_sql)) {
+    $table = $table_from_sql;
+}
+
 
 /**
  * Check rights in case of DROP DATABASE