diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index c80311c55..e3581cf0f 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -130,14 +130,28 @@ define(req, function(AppConfig, Default, Language) {
     };
 
 Messages.install_token = "Install token";
-Messages.install_header = "Installation"; // XXX
-Messages.install_instance = "Set up your new CryptPad instance"; // XXX
-Messages.install_launch = "Launch";
+Messages.install_header = "Installation";
+Messages.install_instance = "Create the first admin account, then proceed to customize this instance";
+Messages.install_launch = "Instance setup";
 Messages.install_notes = `<ul class="cp-notes-list">
-<li>This page will help you create your first administrator account and set up your instance.</li>
-<li>Your password is the secret key that encrypts all of your documents. <span class="red">If you lose it there is no way we can recover your data.</span></li>
+<li>Create your first administrator account on this page. Administrators manage instance settings including storage quotas, and have access to moderation tools.</li>
+<li>Your password is the secret key that encrypts all of your documents and administrator privileges on this instance. <span class="red">If you lose it there is no way we can recover your data.</span></li>
 <li>If you are using a shared computer, <span class="red">remember to log out</span> when you are done. Only closing the browser window leaves your account exposed. </li></ul>`;
 
+Messages.admin_appSelection = 'App configuration';
+Messages.admin_appsTitle = "Instance applications";
+Messages.admin_appsHint = "Choose which apps to enable on this instance.";
+Messages.admin_cat_apps = "Applications";
+
+Messages.onboarding_save_error = "Some options could not be saved properly. Please visit the administration panel to check the values.";
+Messages.onboarding_upload = "Select logo";
+Messages.admin_onboardingNameTitle = 'Welcome to your CryptPad instance';
+Messages.admin_onboardingNameHint = 'Please choose a title, description, accent color and logo (all are optional)';
+Messages.admin_onboardingOptionsTitle = "Instance options";
+Messages.admin_onboardingOptionsHint = "Please select the apropriate option for your instance. These settings can be changed later in the admin panel.";
+Messages.admin_onboardingNamePlaceholder = 'Instance title';
+Messages.admin_onboardingDescPlaceholder = 'Instance description text';
+
     return Messages;
 
 });
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 75a2c4aa4..a00bbf615 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -49,12 +49,6 @@ define([
     Onboarding,
 ) {
 
-    //XXX 
-    Messages.admin_appSelection = 'App configuration';
-    Messages.admin_appsTitle = "Choose your applications";
-    Messages.admin_appsHint = "Choose which apps to disable on your instance.";
-    Messages.admin_cat_apps = "Apps";
-
     var APP = window.APP = {};
 
     var Nacl = window.nacl;
diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js
index c37941057..6272da418 100644
--- a/www/install/onboardscreen.js
+++ b/www/install/onboardscreen.js
@@ -26,18 +26,6 @@ define([
     nThen
 ) {
 
-    //XXX
-    Messages.onboarding_save_error = "Some options could not be saved properly. Please visit the administration panel to check the values.";
-    Messages.onboarding_upload = "Select logo";
-    Messages.admin_onboardingNameTitle = 'Welcome to your CryptPad instance';
-    Messages.admin_onboardingNameHint = 'Please choose a title and description';
-    Messages.admin_appsTitle = "Instance applications";
-    Messages.admin_appsHint = "Choose which apps to enable on your instance";
-    Messages.admin_onboardingOptionsTitle = "Instance options";
-    Messages.admin_onboardingOptionsHint = "Please select the apropriate option for your instance. These settings can be changed later in the admin panel.";
-    Messages.admin_onboardingNamePlaceholder = 'Instance title';
-    Messages.admin_onboardingDescPlaceholder = 'Placeholder description text';
-
     let pages = [];
     const gotoPage = function (Env, page) {
         if (typeof(page) !== "number" || !page) { page = 0; }