diff --git a/ChangeLog b/ChangeLog
index d80efaf287..ce6d6dc796 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
 + rfe       Support virtual columns in MySQL 5.7.5+
 + rfe #1517 Support for virtual/persistent columns in MariaDB
 - bug #4984 Undefined <feature>work upon upgrade to new version
+- issue #1817 Creating configuration storage tables fail in MySQL 5.7
 
 4.4.13.0 (not yet released)
 - issue #1808 "Improve table structure" generates invalid SQL
diff --git a/sql/create_tables.sql b/sql/create_tables.sql
index fb1894a8e4..f906115fbe 100644
--- a/sql/create_tables.sql
+++ b/sql/create_tables.sql
@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `pma__history` (
   `username` varchar(64) NOT NULL default '',
   `db` varchar(64) NOT NULL default '',
   `table` varchar(64) NOT NULL default '',
-  `timevalue` timestamp NOT NULL,
+  `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP,
   `sqlquery` text NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `username` (`username`,`db`,`table`,`timevalue`)
@@ -231,7 +231,7 @@ CREATE TABLE IF NOT EXISTS `pma__tracking` (
 
 CREATE TABLE IF NOT EXISTS `pma__userconfig` (
   `username` varchar(64) NOT NULL,
-  `timevalue` timestamp NOT NULL,
+  `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `config_data` text NOT NULL,
   PRIMARY KEY  (`username`)
 )