diff --git a/src/authentic2_auth_fedict/adapters.py b/src/authentic2_auth_fedict/adapters.py
index 69c8215..ee72a76 100644
--- a/src/authentic2_auth_fedict/adapters.py
+++ b/src/authentic2_auth_fedict/adapters.py
@@ -196,6 +196,11 @@ class AuthenticAdapter(DefaultAdapter):
         Attribute.objects.get(name='title').set_value(user, title,
                 verified=True)
 
+        if saml_attributes.get('givenName'):
+            Attribute.objects.get(name='first_name').set_value(user, saml_attributes['givenName'][0], verified=True)
+        if saml_attributes.get('surname'):
+            Attribute.objects.get(name='last_name').set_value(user, saml_attributes['surname'][0], verified=True)
+
         user.save()
 
         if nrn: