diff --git a/src/cli/oneuser b/src/cli/oneuser
index 531db2b15e..49559db58e 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -212,15 +212,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :passwd, passwd_desc, :userid, :password,
             :options=>create_options do
-        if options[:ssh] or options[:x509]
+        if args[1]
+            pass = args[1]
+        else
             rc = helper.password(options)
             if rc.first == 0
                 pass = rc[1]
             else
                 exit_with_code *rc
             end
-        else
-            pass = args[1]
         end
 
         helper.perform_action(args[0],options,"Password changed") do |user|