diff --git a/lib/commands.py b/lib/commands.py
index e0552762..56a3956d 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -101,7 +101,11 @@ class Commands:
             if password is None:
                 return
         f = getattr(self, method)
-        result = f(*args, **{'password':password})
+        if cmd.requires_password:
+            result = f(*args, **{'password':password})
+        else:
+            result = f(*args)
+        
         if self._callback:
             apply(self._callback, ())
         return result