diff --git a/app/main/views/register.py b/app/main/views/register.py
index 7069270ea..e6350c8f7 100644
--- a/app/main/views/register.py
+++ b/app/main/views/register.py
@@ -160,13 +160,16 @@ def set_up_your_profile():
         # create the user
         # TODO we have to provide something for password until that column goes away
         # TODO ideally we would set the user's preferred timezone here as well
-        user = User.register(
-            name=form.name.data,
-            email_address=user_email,
-            mobile_number=form.mobile_number.data,
-            password=str(uuid.uuid4()),
-            auth_type="sms_auth",
-        )
+
+        user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
+        if user is None:
+            user = User.register(
+                name=form.name.data,
+                email_address=user_email,
+                mobile_number=form.mobile_number.data,
+                password=str(uuid.uuid4()),
+                auth_type="sms_auth",
+            )
 
         # activate the user
         user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)