diff --git a/gnuviechadmin/cli/__init__.py b/gnuviechadmin/cli/__init__.py
index fa9d112..36eafbb 100644
--- a/gnuviechadmin/cli/__init__.py
+++ b/gnuviechadmin/cli/__init__.py
@@ -28,11 +28,12 @@ __all__ = ["client", "sysuser", "domain", "record"]
 from logging import getLogger
 from sys import exit
 from argparse import ArgumentParser
-from gettext import gettext as _
+import gettext
 
 
 class CommandLineInterface(object):
     def __init__(self, config, args):
+        gettext.install('gnuviechadmin')
         self.log = getLogger(__name__)
         self.config = config
         parser = ArgumentParser(prog=args[0])
diff --git a/gnuviechadmin/cli/client.py b/gnuviechadmin/cli/client.py
index 4a16b32..86a88ec 100644
--- a/gnuviechadmin/cli/client.py
+++ b/gnuviechadmin/cli/client.py
@@ -20,7 +20,6 @@
 # Version: $Id$
 import CliCommand
 import sys
-from gettext import gettext as _
 
 
 class ClientCli(CliCommand.CliCommand):
@@ -95,7 +94,6 @@ class ClientCli(CliCommand.CliCommand):
                 if self.args.verbose:
                     print unicode(myclient).encode('utf8')
             except CreationFailedError, cfe:
-                self._usage()
                 print cfe
                 sys.exit(2)
         elif self.args.subcommand == "list":