diff --git a/models/coworker.py b/models/coworker.py
index f06cc70..a02e502 100644
--- a/models/coworker.py
+++ b/models/coworker.py
@@ -59,5 +59,11 @@ class Coworker(models.Model):
     @api.depends('street', 'contact_zip', 'city')
     def _compute_full_contact_adress(self):
         for coworker in self:
+            if coworker.city:
+                coworker.full_contact_adress = u'{}'.format(coworker.city)
+
+            if coworker.contact_zip and coworker.city:
+                coworker.full_contact_adress = u'{} {}'.format(coworker.contact_zip, coworker.city)
+
             if coworker.street and coworker.contact_zip and coworker.city:
-                coworker.full_contact_adress = u'{} {} {}'.format (coworker.street, coworker.contact_zip, coworker.city)
+                coworker.full_contact_adress = u'{} {} {}'.format(coworker.street, coworker.contact_zip, coworker.city)