diff --git a/config/alfresco/bootstrap/system.xml b/config/alfresco/bootstrap/system.xml
index ccc253657d..ef5def063b 100644
--- a/config/alfresco/bootstrap/system.xml
+++ b/config/alfresco/bootstrap/system.xml
@@ -34,7 +34,7 @@
                               <view:permission>Read</view:permission>
                            </view:ace>
                         </view:acl>
-                        <cm:userName>guest</cm:userName>
+                        <cm:userName>${alfresco_user_store.guestusername}</cm:userName>
                         <cm:firstName>Guest</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 3580ef0b3e..dacb3856ed 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -264,7 +264,7 @@
         </property>
         <property name="configuration">
             <props>
-                <prop key="alfresco_user_store.adminusername">${alfresco_user_store.adminusername}</prop>
+                <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>
@@ -302,6 +302,7 @@
         <property name="configuration">
             <props>
                 <prop key="alfresco_user_store.adminusername">${alfresco_user_store.adminusername}</prop>
+                <prop key="alfresco_user_store.guestusername">${alfresco_user_store.guestusername}</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 c45b944f5b..395c998a4c 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -103,6 +103,9 @@ alfresco_user_store.authorities_container.childname=sys:authorities
 # note: default admin username - should not be changed
 alfresco_user_store.adminusername=admin
 
+# note: default guest username - should not be changed
+alfresco_user_store.guestusername=guest
+
 # Spaces Archive Configuration
 spaces.archive.store=archive://SpacesStore