diff --git a/opentech/apply/users/models.py b/opentech/apply/users/models.py
index ad5582809169f3a247033b04c94c9112de6f29f0..16dfeee7c2b888876447e34284d27c400e0d9000 100644
--- a/opentech/apply/users/models.py
+++ b/opentech/apply/users/models.py
@@ -7,11 +7,11 @@ from .utils import send_activation_email
 
 def convert_full_name_to_parts(defaults):
     full_name = defaults.pop('full_name', ' ')
-    first_name, last_name = full_name.split(' ', 1)
+    first_name, *last_name = full_name.split(' ')
     if first_name:
         defaults.update(first_name=first_name)
     if last_name:
-        defaults.update(last_name=last_name)
+        defaults.update(last_name=' '.join(last_name))
     return defaults