diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js
index d0ea7eb5..6085a8bf 100644
--- a/lib/cloudcmd.js
+++ b/lib/cloudcmd.js
@@ -67,7 +67,7 @@
                 break;
             case 'password':
                 /* could be useful when used as middleware */
-                value = createPass(config('algo'), value);
+                value = createPass(value, config('algo'));
                 break;
             case 'prefix':
                 prefix = prefixer(value);
diff --git a/lib/server/config.js b/lib/server/config.js
index 1c10ed35..852d2bc8 100644
--- a/lib/server/config.js
+++ b/lib/server/config.js
@@ -187,7 +187,7 @@
         var algo = manage('algo');
         
         if (json && json.password)
-            json.password = password(algo, json.password);
+            json.password = password(json.password, algo);
     }
     
 })();