diff --git a/HELP.md b/HELP.md
index ee39b0ae..2eafbb3e 100644
--- a/HELP.md
+++ b/HELP.md
@@ -64,11 +64,11 @@ Cloud Commander supports command line parameters:
 | `-on, --online`       | load scripts from remote servers
 | `-off, --offline`     | load scripts from local server
 | `-a, --auth`          | enable authorization
-| `-na, --no-auth`      | disable authorization
+| `-na, --noauth`       | disable authorization
 | `-p, --port`          | set port number
 | `-u, --username`      | set username
 | `-ps, --password`     | set password
-| `-ns, --no-server`    | do not start server
+| `-ns, --noserver`     | do not start server
 
 If no parameters given Cloud Commander reads information from `~/.cloudcmd.json` and use
 port from it (`8000` default). if port variables `PORT` or `VCAP_APP_PORT` isn't exist.
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index 5950d8eb..a3b3b522 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -25,9 +25,9 @@
                 'offline',
             ],
             boolean: [
-                'no-server',
                 'auth',
-                'no-auth',
+                'noauth',
+                'noserver',
                 'repl',
                 'save'],
             alias: {
@@ -40,8 +40,8 @@
                 ps: 'password',
                 s: 'save',
                 a: 'auth',
-                na: 'no-auth',
-                ns: 'no-server'
+                na: 'noauth',
+                ns: 'noserver'
             }
         });
     
@@ -82,7 +82,7 @@
     function start(config) {
         var SERVER      = '../lib/server';
         
-        if (!args['no-server'])
+        if (!args.noserver)
             require(SERVER)(config);
     }
     
diff --git a/json/bin.json b/json/bin.json
index 50d5f739..de1fc1ef 100644
--- a/json/bin.json
+++ b/json/bin.json
@@ -5,9 +5,9 @@
     "-on, --online  "   : "load scripts from remote servers",
     "-off, --offline"   : "load scripts from local server",
     "-a, --auth     "   : "enable authorization",
-    "-na, --no-auth "   : "disable authorization",
+    "-na, --noauth "   : "disable authorization",
     "-p, --port     "   : "set port number",
     "-u, --username "   : "set username",
     "-ps, --password"   : "set password",
-    "-ns, --no-server"  : "do not start server"
+    "-ns, --noserver"  : "do not start server"
 }