diff --git a/alertaclient/commands/cmd_me.py b/alertaclient/commands/cmd_me.py
index cc3e330..09e7640 100644
--- a/alertaclient/commands/cmd_me.py
+++ b/alertaclient/commands/cmd_me.py
@@ -18,11 +18,8 @@ def cli(obj, name, email, password, status, text):
 
     client = obj['client']
     try:
-        r = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
+        user = client.update_me(name=name, email=email, password=password, status=status, attributes=None, text=text)
     except Exception as e:
         click.echo('ERROR: {}'.format(e), err=True)
         sys.exit(1)
-    if r['status'] == 'ok':
-        click.echo('Updated.')
-    else:
-        click.echo(r['message'])
+    click.echo(user.id)
diff --git a/alertaclient/commands/cmd_user.py b/alertaclient/commands/cmd_user.py
index 87a5adb..889a931 100644
--- a/alertaclient/commands/cmd_user.py
+++ b/alertaclient/commands/cmd_user.py
@@ -26,7 +26,7 @@ def parse_args(self, ctx, args):
 @click.option('--status', help='Status eg. active, inactive')
 @click.option('--role', 'roles', multiple=True, help='List of roles')
 @click.option('--text', help='Description of user')
-@click.option('--email-verified/--email-not-verified', default=False, help='Email address verified flag')
+@click.option('--email-verified/--email-not-verified', default=None, help='Email address verified flag')
 @click.option('--delete', '-D', metavar='UUID', help='Delete user using ID')
 @click.pass_obj
 def cli(obj, id, name, email, password, status, roles, text, email_verified, delete):
@@ -35,21 +35,18 @@ def cli(obj, id, name, email, password, status, roles, text, email_verified, del
     if delete:
         client.delete_user(delete)
     elif id:
-        if not any([name, email, password, status, roles, text, email_verified]):
+        if not any([name, email, password, status, roles, text, (email_verified is not None)]):
             click.echo('Nothing to update.')
             sys.exit(1)
         try:
-            r = client.update_user(
+            user = client.update_user(
                 id, name=name, email=email, password=password, status=status,
                 roles=roles, attributes=None, text=text, email_verified=email_verified
             )
         except Exception as e:
             click.echo('ERROR: {}'.format(e), err=True)
             sys.exit(1)
-        if r['status'] == 'ok':
-            click.echo('Updated.')
-        else:
-            click.echo(r['message'])
+        click.echo(user.id)
     else:
         if not email:
             raise click.UsageError('Need "--email" to create user.')
diff --git a/tox.ini b/tox.ini
index 774e3ec..d73f9c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38
+envlist = py36,py37,py38,py39
 skip_missing_interpreters=true
 
 [testenv]