diff --git a/CHANGELOG b/CHANGELOG
index bda740c7f..36f9bd8b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Fix db_prefix handling in queries with `TRUNCATE TABLE <name>` and `UNIQUE <name>` (#7013)
 - Fix so update.sh script warns about changed defaults (#7011)
 - Fix tables listing routine when DSN contained a database with unsupported suffix (#7034)
+- Fix so Elastic is also a default in jqueryui plugin (#7039)
 
 RELEASE 1.4.0
 -------------
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 3451efb1e..3af616f2a 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,7 +6,7 @@ $config['jquery_ui_i18n'] = array('datepicker');
 // map Roundcube skins with jquery-ui themes here
 $config['jquery_ui_skin_map'] = array(
   'larry' => 'larry',
-  'default' => 'larry',
+  'default' => 'elastic',
 );
 
 ?>
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 3e6e3724a..23d7e8e7d 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -18,6 +18,10 @@ class jqueryui extends rcube_plugin
 
     private static $features = array();
     private static $ui_theme;
+    private static $skin_map = array(
+        'larry' => 'larry',
+        'default' => 'elastic',
+    );
 
     public function init()
     {
@@ -35,9 +39,9 @@ class jqueryui extends rcube_plugin
 
         // include UI stylesheet
         $skin     = $rcmail->config->get('skin');
-        $ui_map   = $rcmail->config->get('jquery_ui_skin_map', array());
+        $ui_map   = $rcmail->config->get('jquery_ui_skin_map', self::$skin_map);
         $skins    = array_keys($rcmail->output->skins);
-        $skins[]  = 'larry';
+        $skins[]  = 'elastic';
 
         foreach ($skins as $skin) {
             self::$ui_theme = $ui_theme = $ui_map[$skin] ?: $skin;
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index a639bd2a9..78a67dad8 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -63,7 +63,7 @@ class rcmail_install
 
     /** @var array List of config options with default value change per-release */
     public $defaults_changes = array(
-        '1.4.0' => array('skin', 'smtp_port', 'smtp_user', 'smtp_pass'),
+        '1.4.0' => array('skin', 'smtp_port', 'smtp_user', 'smtp_pass', 'jquery_ui_skin_map'),
     );
 
     /**