diff --git a/HELP.md b/HELP.md
index 5eaf6de0..38e6c1ba 100644
--- a/HELP.md
+++ b/HELP.md
@@ -336,6 +336,7 @@ Some config options can be overridden with `environment variables` such:
 - `CLOUDCMD_TERMINAL_PATH` - set terminal path
 - `CLOUDCMD_CONFIG_DIALOG` - enable config dialog
 - `CLOUDCMD_AUTH` - enable authentication
+- `CLOUDCMD_PASSWORD` - set password
 
 Menu
 ---------------
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index b61320ee..ee8b48be 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -121,8 +121,10 @@ function main() {
         prefix: args.prefix
     };
     
-    if (args.password)
-        config('password', getPassword(args.password));
+    const password = env('password') || args.password;
+    
+    if (password)
+        config('password', getPassword(password));
     
     validateRoot(options.root);