diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
index 196afb5b29..ef51e52165 100644
--- a/libraries/classes/Controllers/Database/DatabaseStructureController.php
+++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -119,6 +119,7 @@ class DatabaseStructureController extends DatabaseController
             array(
                 'db_structure.js',
                 'tbl_change.js',
+                'vendor/jquery/jquery.validate.js',
                 'vendor/jquery/jquery-ui-timepicker-addon.js'
             )
         );
diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php
index 63f1971fd5..8d0677f48d 100644
--- a/libraries/classes/Controllers/Table/TableSearchController.php
+++ b/libraries/classes/Controllers/Table/TableSearchController.php
@@ -201,6 +201,7 @@ class TableSearchController extends TableController
                         'sql.js',
                         'tbl_select.js',
                         'tbl_change.js',
+                        'vendor/jquery/jquery.validate.js',
                         'vendor/jquery/jquery-ui-timepicker-addon.js',
                         'vendor/jquery/jquery.uitablefilter.js',
                         'gis_data_editor.js',
@@ -239,6 +240,7 @@ class TableSearchController extends TableController
                         'vendor/jqplot/plugins/jqplot.highlighter.js',
                         'vendor/jqplot/plugins/jqplot.cursor.js',
                         'vendor/jquery/jquery-ui-timepicker-addon.js',
+                        'vendor/jquery/jquery.validate.js',
                         'tbl_zoom_plot_jqplot.js',
                         'tbl_change.js',
                     )
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 860aa13f94..d58f354a3c 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1871,6 +1871,9 @@ class InsertEdit
             $response = Response::getInstance();
             $header = $response->getHeader();
             $scripts = $header->getScripts();
+            $scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
+            $scripts->addFile('vendor/jquery/jquery.validate.js');
+            $scripts->addFile('vendor/jquery/additional-methods.js');
             $scripts->addFile('tbl_change.js');
             if (!defined('TESTSUITE')) {
                 include 'tbl_change.php';
diff --git a/tbl_replace.php b/tbl_replace.php
index 7c704ac21d..69c5ba0e71 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -454,6 +454,9 @@ if (! empty($return_to_sql_query)) {
     $GLOBALS['sql_query'] = $return_to_sql_query;
 }
 
+$scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
+$scripts->addFile('vendor/jquery/jquery.validate.js');
+$scripts->addFile('vendor/jquery/additional-methods.js');
 $scripts->addFile('tbl_change.js');
 
 $active_page = $goto_include;
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 44eea3babd..a5d4e5784a 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -1842,7 +1842,7 @@ class InsertEditTest extends TestCase
             ->setMethods(array('addFile'))
             ->getMock();
 
-        $scriptsMock->expects($this->once())
+        $scriptsMock->expects($this->exactly(4))
             ->method('addFile');
 
         $headerMock = $this->getMockBuilder('PhpMyAdmin\Header')