diff --git a/HELP.md b/HELP.md
index dc0b46cf..b7e7b4c1 100644
--- a/HELP.md
+++ b/HELP.md
@@ -63,10 +63,10 @@ Cloud Commander supports command line parameters:
 | `-s, --save`          | save options
 | `-o, --online`        | load scripts from remote servers
 | `-a, --auth`          | enable authorization
-| `-p, --port`          | set port number
 | `-u, --username`      | set username
-| `-ps, --password`     | set password
-| `--no-auth`            | disable authorization
+| `-p, --password`      | set password
+| `--port`              | set port number
+| `--no-auth`           | disable authorization
 | `--no-server`         | do not start server
 | `--no-online`         | load scripts from remote servers
 
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index 5b45d14f..82e8fff5 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -31,16 +31,16 @@
                 'save'],
             default: {
                 'auth'  : config('auth'),
+                'port'  : config('port'),
                 'online': config('online'),
                 'server': true
             },
             alias: {
                 v: 'version',
                 h: 'help',
-                p: 'port',
+                p: 'password',
                 on: 'online',
                 u: 'username',
-                ps: 'password',
                 s: 'save',
                 a: 'auth'
             }
@@ -94,13 +94,13 @@
             config('username', name);
     }
     
-    function port(number) {
-        if (number) {
-            if (!isNaN(number))
-                config('port', number);
-            else
-                console.error('port: ignored, should be a number');
-        }
+    function port(arg) {
+        var number = parseInt(arg, 10);
+        
+        if (!isNaN(number))
+            config('port', number);
+        else
+            console.error('port: ignored, should be a number');
     }
     
     function help() {
diff --git a/json/bin.json b/json/bin.json
index d707ca98..8be32157 100644
--- a/json/bin.json
+++ b/json/bin.json
@@ -4,9 +4,9 @@
     "-s, --save     "   : "save options",
     "-o, --online   "   : "load scripts from remote servers",
     "-a, --auth     "   : "enable authorization",
-    "-p, --port     "   : "set port number",
     "-u, --username "   : "set username",
-    "-ps, --password"   : "set password",
+    "-p, --password "   : "set password",
+    "--port         "   : "set port number",
     "--no-auth "        : "disable authorization",
     "--no-server"       : "do not start server",
     "--no-online"       : "load scripts from local server"