diff --git a/config/alfresco/bootstrap/alfrescoUserStore.xml b/config/alfresco/bootstrap/alfrescoUserStore.xml
index e8eeb48906..51ad310374 100644
--- a/config/alfresco/bootstrap/alfrescoUserStore.xml
+++ b/config/alfresco/bootstrap/alfrescoUserStore.xml
@@ -9,8 +9,8 @@
             <sys:container view:childName="${alfresco_user_store.user_container.childname}">
                 <sys:children>
                     <usr:user view:childName="usr:user">
-                        <usr:username>admin</usr:username>
-                        <usr:password>209c6174da490caeb422f3fa5a7ae634</usr:password>   
+                        <usr:username>${alfresco_user_store.adminusername}</usr:username>
+                        <usr:password>${alfresco_user_store.adminpassword}</usr:password>
                         <usr:enabled>true</usr:enabled>
                         <usr:accountExpires>false</usr:accountExpires>
                         <usr:credentialsExpire>false</usr:credentialsExpire>
diff --git a/config/alfresco/bootstrap/system.xml b/config/alfresco/bootstrap/system.xml
index 3ce1d4c801..ccc253657d 100644
--- a/config/alfresco/bootstrap/system.xml
+++ b/config/alfresco/bootstrap/system.xml
@@ -18,7 +18,7 @@
             <sys:container view:childName="${system.people_container.childname}">
                 <sys:children>
                     <cm:person view:childName="cm:person">
-                        <cm:userName>admin</cm:userName>
+                        <cm:userName>${alfresco_user_store.adminusername}</cm:userName>
                         <cm:firstName>Administrator</cm:firstName>
                         <cm:lastName></cm:lastName>
                         <cm:email></cm:email>
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index dcb7841c59..3580ef0b3e 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -244,6 +244,8 @@
         </property>
         <property name="configuration">
             <props>
+                <prop key="alfresco_user_store.adminusername">${alfresco_user_store.adminusername}</prop>
+                <prop key="alfresco_user_store.adminpassword">209c6174da490caeb422f3fa5a7ae634</prop>
                 <prop key="alfresco_user_store.system_container.childname">${alfresco_user_store.system_container.childname}</prop>
                 <prop key="alfresco_user_store.user_container.childname">${alfresco_user_store.user_container.childname}</prop>
                 <prop key="alfresco_user_store.authorities_container.childname">${alfresco_user_store.authorities_container.childname}</prop>
@@ -262,6 +264,7 @@
         </property>
         <property name="configuration">
             <props>
+                <prop key="alfresco_user_store.adminusername">${alfresco_user_store.adminusername}</prop>
                 <prop key="version.major">${version.major}</prop>
                 <prop key="version.minor">${version.minor}</prop>
                 <prop key="version.revision">${version.revision}</prop>
@@ -298,6 +301,7 @@
         </property>
         <property name="configuration">
             <props>
+                <prop key="alfresco_user_store.adminusername">${alfresco_user_store.adminusername}</prop>
                 <prop key="spaces.company_home.childname">${spaces.company_home.childname}</prop>
                 <prop key="spaces.guest_home.childname">${spaces.guest_home.childname}</prop>
                 <prop key="system.system_container.childname">${system.system_container.childname}</prop>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 2a45770328..c45b944f5b 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -100,6 +100,9 @@ alfresco_user_store.system_container.childname=sys:system
 alfresco_user_store.user_container.childname=sys:people
 alfresco_user_store.authorities_container.childname=sys:authorities
 
+# note: default admin username - should not be changed
+alfresco_user_store.adminusername=admin
+
 # Spaces Archive Configuration
 spaces.archive.store=archive://SpacesStore