diff --git a/tatuclient/v1/cli/usercert.py b/tatuclient/v1/cli/usercert.py
index 892065a..33bb0ac 100644
--- a/tatuclient/v1/cli/usercert.py
+++ b/tatuclient/v1/cli/usercert.py
@@ -73,7 +73,9 @@ class CreateUserCertCommand(command.ShowOne):
     def take_action(self, parsed_args):
         client = self.app.client_manager.ssh
         common.set_all_common_headers(client, parsed_args)
-        data = client.usercert.create(parsed_args)
+        data = client.usercert.create(parsed_args.user_id,
+                                      parsed_args.auth_id,
+                                      parsed_args.pub_key)
         return _names, utils.get_item_properties(data, _columns)
 
 
@@ -82,13 +84,13 @@ class RevokeUserCertCommand(command.ShowOne):
 
     def get_parser(self, prog_name):
         parser = super(RevokeUserCertCommand, self).get_parser(prog_name)
-        parser.add_argument('serial', help="Serial Number")
         parser.add_argument('auth_id', help="Project/CA ID")
+        parser.add_argument('serial', help="Serial Number")
         common.add_all_common_options(parser)
         return parser
 
     def take_action(self, parsed_args):
         client = self.app.client_manager.ssh
         common.set_all_common_headers(client, parsed_args)
-        data = client.usercert.create(parsed_args.auth_id, parsed_args.serial)
+        data = client.usercert.revoke(parsed_args.auth_id, parsed_args.serial)
         return _names, utils.get_item_properties(data, _columns)
diff --git a/tatuclient/v1/usercert.py b/tatuclient/v1/usercert.py
index aa6501c..fd614cc 100644
--- a/tatuclient/v1/usercert.py
+++ b/tatuclient/v1/usercert.py
@@ -18,8 +18,13 @@ from tatuclient.v1 import utils as v1_utils
 
 class UserCertController(V1Controller):
 
-    def create(self, **kwargs):
-        return self._post('/noauth/usercerts', data=kwargs)
+    def create(self, user_id, auth_id, pub_key):
+        data = {
+            'user_id': user_id,
+            'auth_id': auth_id,
+            'pub_key': pub_key,
+        }
+        return self._post('/noauth/usercerts', data=data)
 
     def list(self, criterion=None, marker=None, limit=None):
         url = self.build_url('/noauth/usercerts', criterion, marker, limit)