diff --git a/cccli/command.py b/cccli/command.py
index 137f9647d4a86c2005743238c1d86aceed2f84f0..da3263c028bf8db71fe527fff4a0b059c32d32c9 100644
--- a/cccli/command.py
+++ b/cccli/command.py
@@ -164,7 +164,7 @@ class Command(object):
     def cmd_history(self, argv):
         '''Show history of commands'''
         if not self.printer.history:
-            raise cmdError("History is not available")
+            raise cmdError("not available")
         for l in self.printer.history:
             self.printer.out(l)
     cmd_history.usage = "history"
@@ -292,6 +292,17 @@ class Command(object):
             self.printer.out("%s: %ss"%(o["a"],o["con"]))
     cmd_uptime.usage = "uptime [login]"
 
+    def cmd_settag(self, argv):
+        '''Set tag on account'''
+        if len(argv) != 4:
+            raise cmdBadArgument()
+        try:
+            self.cli.rpc.settag(argv[1], argv[2], argv[3])
+        except RpcError as e:
+            raise cmdError("RPCError: %s"%str(e))
+    cmd_settag.usage = "settag <account> <tag> <value>"
+
+
 
 class Alias(dict):
     ''' Alias wrapper'''