diff --git a/profiles/forms.py b/profiles/forms.py
index b1152d62495248f598cc3020daae06cc7cb133db..e8dd84e0d5c9e9a0091eb9812c78198ddbd53611 100644
--- a/profiles/forms.py
+++ b/profiles/forms.py
@@ -18,7 +18,7 @@ class ProfileForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['email'].initial = self.instance.email.email
+        self.fields['email'].initial = self.instance.email
 
     def clean_email(self):
         """Check that the email isn't yet associated to an existing Profile."""
diff --git a/profiles/models.py b/profiles/models.py
index dd3d19e45f551bbadda6f47cf671657b92e4d3c9..7787262628c45a2d2b71c7dae54b81b00183c452 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -61,7 +61,7 @@ class Profile(models.Model):
 
     @property
     def email(self):
-        return self.emails.filter(primary=True).first()
+        return getattr(self.emails.filter(primary=True).first(), 'email', '')
 
 
 class ProfileEmail(models.Model):