diff --git a/component/common/src/main/java/org/exoplatform/platform/common/account/setup/web/AccountSetup.java b/component/common/src/main/java/org/exoplatform/platform/common/account/setup/web/AccountSetup.java
index eee36281cb..30d8c9aead 100644
--- a/component/common/src/main/java/org/exoplatform/platform/common/account/setup/web/AccountSetup.java
+++ b/component/common/src/main/java/org/exoplatform/platform/common/account/setup/web/AccountSetup.java
@@ -7,6 +7,7 @@
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.ComponentRequestLifecycle;
 import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.portal.config.UserACL;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.organization.*;
@@ -61,6 +62,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         String userPasswordAccount = request.getParameter(USER_PASSWORD_ACCOUNT);
         String adminPassword = request.getParameter(ADMIN_PASSWORD);
         OrganizationService orgService;
+        UserACL userACL;
         UserHandler userHandler;
         SettingService settingService_;
         User user;
@@ -69,6 +71,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
         try {
             orgService = (OrganizationService) PortalContainer.getInstance().getComponentInstanceOfType(OrganizationService.class);
+            userACL = (UserACL) PortalContainer.getInstance().getComponentInstanceOfType(UserACL.class);
             RequestLifeCycle.begin((ComponentRequestLifecycle) orgService);
             // --- Get MemberShipType Service
             MembershipTypeHandler membershipTypeHandler = orgService.getMembershipTypeHandler();
@@ -126,7 +129,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
             // Set password for admin user
             try {
-                User adminUser = userHandler.findUserByName(ADMIN_FIRST_NAME);
+
+                User adminUser = userHandler.findUserByName(userACL.getSuperUser());
                 adminUser.setPassword(adminPassword);
                 orgService.getUserHandler().saveUser(adminUser, false);
             } catch (Exception e) {
diff --git a/extension/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp b/extension/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp
index 004983fbfe..0e9d835cf6 100644
--- a/extension/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp
+++ b/extension/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp
@@ -1,4 +1,6 @@
 <%@ page import="org.exoplatform.platform.common.account.setup.web.PingBackServlet" %>
+<%@ page import="org.exoplatform.container.PortalContainer" %>
+<%@ page import="org.exoplatform.portal.config.UserACL" %>
 <%
     /**
      * Copyright ( C ) 2012 eXo Platform SAS.
@@ -21,6 +23,7 @@
 %>
 <%@ page language="java" %>
 <%
+    UserACL userACL = (UserACL)PortalContainer.getInstance().getComponentInstanceOfType(UserACL.class);
     String usernameRegExp = System.getProperty("gatein.validators.username.regexp");
     if(usernameRegExp==null) usernameRegExp="";
     String formatMsg = System.getProperty("gatein.validators.username.format.message");
@@ -86,7 +89,7 @@
             <p class="desc">Login as root user with the following password for super administrator access</p>
             <div class="control-group" id="adminUsernameId">
                 <label class="control-label">Username:</label>
-                <div class="controls"><input type="text" name="adminFirstName" id="adminFirstName" placeholder="root" readonly="readonly" class="inputFieldLarge disable" /></div>
+                <div class="controls"><input type="text" name="adminFirstName" id="adminFirstName" placeholder="<%=userACL.getSuperUser()%>" readonly="readonly" class="inputFieldLarge disable" /></div>
             </div>
             <div class="control-group" id="adminPasswordId">
                 <label class="control-label">Password:</label>