diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py
index da6b4ab..8aa9e99 100644
--- a/komrade/cli/cli.py
+++ b/komrade/cli/cli.py
@@ -70,12 +70,17 @@ class CLI(Logger):
 
     def login(self,name):
         name=self.name if not name else name
-        names = '?' if not name else name
+        if not name: name=input('name: ')
+        if not name: return
+
         from getpass import getpass
-        passphrase=getpass('\nPassword: ')
+        passphrase=None
+        if not passphrase: passphrase=getpass('password: ')
+        if not passphrase: return
+
         if not self._komrade:
             self._komrade = Komrade(name if name else self.name)
-        print(self._komrade.login())
+        print(self._komrade.login(passphrase=passphrase))
         self._name=self._komrade.name
 
     @property