diff --git a/examples/getstarted/config/server.js b/examples/getstarted/config/server.js
index d1989c8ec7..fbc1eb0c1f 100644
--- a/examples/getstarted/config/server.js
+++ b/examples/getstarted/config/server.js
@@ -2,6 +2,7 @@ module.exports = ({ env }) => ({
   host: env('HOST', '0.0.0.0'),
   port: env.int('PORT', 1337),
   admin: {
+    autoOpen: true,
     auth: {
       secret: env('ADMIN_JWT_SECRET', 'example-token'),
     },
diff --git a/packages/core/strapi/lib/Strapi.js b/packages/core/strapi/lib/Strapi.js
index 4e3f456cac..22986c85c6 100644
--- a/packages/core/strapi/lib/Strapi.js
+++ b/packages/core/strapi/lib/Strapi.js
@@ -327,6 +327,11 @@ class Strapi {
     const modules = await loadModules(this);
 
     this.admin = require('@strapi/admin/strapi-server');
+
+    // TODO: rename into just admin and ./config/admin.js
+    const userAdminConfig = strapi.config.get('server.admin');
+    this.config.set('server.admin', _.merge(this.admin.config, userAdminConfig));
+
     this.api = modules.api;
     this.components = modules.components;
     this.plugins = modules.plugins;