diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
index c4a15d1dc4..768853e4a5 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
@@ -40,7 +40,7 @@ public class ShellCommand extends AbstractCommand {
         this.helpFile = new String[] {
             interactive ? "Usage: [task] [task-options] [task data]" : "Usage: Main [--extdir <dir>] [task] [task-options] [task data]", 
             "",
-            "Tasks (default task is start):",
+            "Tasks:",
             "    start           - Creates and starts a broker using a configuration file, or a broker URI.",
             "    create          - Creates a runnable broker instance in the specified path",
             "    stop            - Stops a running broker specified by the broker name.",
@@ -59,6 +59,11 @@ public class ShellCommand extends AbstractCommand {
             "",
             "Task Data:",
             "    - Information needed by each specific task.",
+            "",
+            "JMX system property options:",
+            "    -Dactivemq.jmx.url=<jmx service uri> (default is: 'service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi')",
+            "    -Dactivemq.jmx.user=<user name>",
+            "    -Dactivemq.jmx.password=<password>",
             ""
         };
     }
diff --git a/assembly/src/release/bin/activemq-admin b/assembly/src/release/bin/activemq-admin
index 4e60ff81bb..bc13fdfe97 100644
--- a/assembly/src/release/bin/activemq-admin
+++ b/assembly/src/release/bin/activemq-admin
@@ -129,7 +129,7 @@ fi
 # Set default classpath
 ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH
 
-if [ $1 = "start" ] ; then
+if [ ""$1 = "start" ] ; then
     if [ -z "$ACTIVEMQ_OPTS" ] ; then
         ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
     fi