diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
index 5f7bba6cf0..bbc8248842 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
@@ -44,6 +44,8 @@ public class CommandAgent implements Service, InitializingBean, DisposableBean,
     private static final Log LOG = LogFactory.getLog(CommandAgent.class);
 
     private String brokerUrl = "vm://localhost";
+    private String username;
+    private String password;
     private ConnectionFactory connectionFactory;
     private Connection connection;
     private Destination commandDestination;
@@ -122,9 +124,25 @@ public class CommandAgent implements Service, InitializingBean, DisposableBean,
 
     public void setBrokerUrl(String brokerUrl) {
         this.brokerUrl = brokerUrl;
-    }
+    }    
 
-    public ConnectionFactory getConnectionFactory() {
+    public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public ConnectionFactory getConnectionFactory() {
         if (connectionFactory == null) {
             connectionFactory = new ActiveMQConnectionFactory(brokerUrl);
         }
@@ -160,7 +178,7 @@ public class CommandAgent implements Service, InitializingBean, DisposableBean,
     }
 
     protected Connection createConnection() throws JMSException {
-        return getConnectionFactory().createConnection();
+        return getConnectionFactory().createConnection(username, password);
     }
 
     protected Destination createCommandDestination() {
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 3ee0056868..422f962420 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -24,7 +24,11 @@
   http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
 
     <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+         <property name="locations">
+            <value>file://${activemq.base}/conf/credentials.properties</value>
+         </property>      
+    </bean>
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.base}/data">
 
@@ -133,14 +137,20 @@
 
     <!-- configure the camel activemq component to use the current broker -->
     <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" >
-        <property name="brokerURL" value="vm://localhost?create=false&amp;waitForStart=10000" />
+        <property name="connectionFactory">
+          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+            <property name="brokerURL" value="vm://localhost?create=false&amp;waitForStart=10000" />
+            <property name="userName" value="${activemq.username}"/>
+            <property name="password" value="${activemq.password}"/>
+          </bean>
+        </property>
     </bean>
 
 
 
     <!-- Uncomment to create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
     <!--
-    <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost"/>
+    <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost" username="${activemq.username}" password="${activemq.password}"/>
     -->
 
 
diff --git a/assembly/src/release/conf/credentials.properties b/assembly/src/release/conf/credentials.properties
new file mode 100644
index 0000000000..9d34d5a4d7
--- /dev/null
+++ b/assembly/src/release/conf/credentials.properties
@@ -0,0 +1,2 @@
+activemq.username=system
+activemq.password=manager
\ No newline at end of file
diff --git a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
index 8746db7e28..a43d3336fa 100644
--- a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
+++ b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
@@ -18,7 +18,11 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 
-  <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+  <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="locations">
+                <value>file://${activemq.base}/conf/credentials.properties</value>
+        </property>  
+  </bean>
   
   <!-- use the following bean for a local in-JVM broker -->
   <bean id="brokerQuery" class="org.apache.activemq.web.SingletonBrokerFacade" autowire='constructor' singleton="false"/>
@@ -30,6 +34,8 @@
 
   <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
     <property name="brokerURL" value="vm://localhost"/>
+    <property name="userName" value="${activemq.username}"/>
+    <property name="password" value="${activemq.password}"/>    
   </bean>
 
   <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire='constructor' singleton="false"/>