diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py
index eeefc7a3f..4584203e6 100644
--- a/src/yunohost/certificate.py
+++ b/src/yunohost/certificate.py
@@ -284,7 +284,7 @@ def _certificate_install_letsencrypt(auth, domain_list, force=False, no_checks=F
     # Actual install steps
     for domain in domain_list:
 
-        uo = UnitOperation('letsencrypt_cert_install', [{'domain': domain}],
+        uo = UnitOperation('letsencrypt_cert_install', [('domain': domain)],
                            args={'force': force, 'no_checks': no_checks,
                                  'staging': staging})
         uo.start()
@@ -385,7 +385,7 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal
     # Actual renew steps
     for domain in domain_list:
 
-        uo = UnitOperation('letsencrypt_cert_renew', [{'domain': domain}],
+        uo = UnitOperation('letsencrypt_cert_renew', [('domain': domain)],
                            args={'force': force, 'no_checks': no_checks,
                                  'staging': staging, 'email': email})
         uo.start()
diff --git a/src/yunohost/log.py b/src/yunohost/log.py
index 35cd80fe2..f098e523d 100644
--- a/src/yunohost/log.py
+++ b/src/yunohost/log.py
@@ -354,10 +354,7 @@ class UnitOperation(object):
         name = [self.started_at.strftime("%Y%m%d-%H%M%S")]
         name += [self.operation]
         if self.related_to:
-            if isinstance(self.related_to[0], tuple):
-                name += [self.related_to[0][1]]
-            else:
-                name += self.related_to[0].values()
+            name += [self.related_to[0][1]]
         self._name = '-'.join(name)
         return self._name