diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 83cf835e..4947f8d9 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -69,6 +69,8 @@
 		-->
 		<alfresco.data.location>./alf_data_jetty</alfresco.data.location>
 		<alfresco.db.name>alf_jetty</alfresco.db.name>
+		<alfresco.db.username>alfresco</alfresco.db.username>
+		<alfresco.db.password>alfresco</alfresco.db.password>		
 		<webapp.log.level>error</webapp.log.level>
 		<webapp.log.dir>${project.build.directory}/</webapp.log.dir>
 		<!--  End of testing webapp specific properties -->
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
index de4e0a2e..7d727f4f 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/application.properties
@@ -1,4 +1,4 @@
-#    Licensed to the Apache Software Foundation (ASF) under one or more
+	#    Licensed to the Apache Software Foundation (ASF) under one or more
 #    contributor license agreements.  See the NOTICE file distributed with
 #    this work for additional information regarding copyright ownership.
 #    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -31,8 +31,8 @@ integrity.failOnError=true
 
 db.driver=org.gjt.mm.mysql.Driver
 db.url=jdbc:mysql://localhost/${alfresco.db.name}
-db.username=alfresco
-db.password=alfresco
+db.username=${alfresco.db.username}
+db.password=${alfresco.db.password}
 db.pool.initial=10
 db.pool.max=100