diff --git a/tools/device_management.py b/tools/device_management.py
index 14733f2c02..136725c2e7 100644
--- a/tools/device_management.py
+++ b/tools/device_management.py
@@ -85,15 +85,14 @@ def wrap_init(func):
         api_key = accounts.list_api_keys(filter={
             'key': getenv("MBED_CLOUD_SDK_API_KEY")
         }).next()
-        user = accounts.get_user(api_key.owner_id)
         certificates_owned = list(certs.list_certificates())
         dev_cert_info = None
         for certif in certificates_owned:
-            if certif.type == "developer" and (certif.owner_id == user.id or
+            if certif.type == "developer" and (certif.owner_id == api_key.owner_id or
                                                certif.owner_id == api_key.id):
                 dev_cert_info = certs.get_certificate(certif.id)
-                LOG.info("Found developer certificate onwed by %s named %s",
-                         user.full_name, dev_cert_info.name)
+                LOG.info("Found developer certificate named %s",
+                         dev_cert_info.name)
                 break
         else:
             LOG.warning(
@@ -101,7 +100,7 @@ def wrap_init(func):
                 " Generting a new developer certificate."
             )
             dev_cert_info = CertificatesAPI().add_developer_certificate(
-                "mbed-cli-auto {}".format(user.full_name),
+                "mbed-cli-auto {}".format(api_key.name),
                 description="cetificate auto-generated by Mbed CLI"
             )
         LOG.info("Writing developer certificate %s into c file "