diff --git a/app/main/views/invites.py b/app/main/views/invites.py
index 07f6b3ac8..a4c936456 100644
--- a/app/main/views/invites.py
+++ b/app/main/views/invites.py
@@ -38,9 +38,9 @@ def accept_invite(token):
         )
     if invited_user.status == "accepted":
         session.pop("invited_user_id", None)
-        service = Service.from_id(invited_user.service)
+        service = Service.from_id(invited_user.service_id)
         return redirect(
-            url_for("main.service_dashboard", service_id=invited_user.service)
+            url_for("main.service_dashboard", service_id=invited_user.service_id)
         )
 
     session["invited_user_id"] = invited_user.id
diff --git a/app/main/views/register.py b/app/main/views/register.py
index 1762cb285..d0ceb65a9 100644
--- a/app/main/views/register.py
+++ b/app/main/views/register.py
@@ -186,7 +186,7 @@ def set_up_your_profile():
         invite_data = redis_client.get(f"invitedata-{state}")
         invite_data = json.loads(invite_data)
         debug_msg(f"final state {invite_data}")
-        invited_user_id = invite_data["id"]
+        invited_user_id = invite_data["invited_user_id"]
         invited_user_email_address = get_invited_user_email_address(invited_user_id)
         debug_msg(f"email address from the invite_date is {invited_user_email_address}")
         check_invited_user_email_address_matches_expected(
@@ -195,7 +195,7 @@ def set_up_your_profile():
 
         invited_user_accept_invite(invited_user_id)
         debug_msg(
-            f"accepted invite user {invited_user_email_address} to service {invite_data['service']}"
+            f"accepted invite user {invited_user_email_address} to service {invite_data['service_id']}"
         )
         # We need to avoid taking a second trip through the login.gov code because we cannot pull the
         # access token twice.  So once we retrieve these values, let's park them in redis for 15 minutes
@@ -230,16 +230,19 @@ def set_up_your_profile():
         activate_user(user["id"])
         debug_msg("activated user")
         usr = User.from_id(user["id"])
+
         usr.add_to_service(
-            invite_data["service"],
+            invite_data["service_id"],
             invite_data["permissions"],
             invite_data["folder_permissions"],
-            invite_data["from_user"],
+            invite_data["from_user_id"],
+        )
+        debug_msg(
+            f"Added user {usr.email_address} to service {invite_data['service_id']}"
         )
-        debug_msg(f"Added user {usr.email_address} to service {invite_data['service']}")
         # notify-admin-1766
         # redirect new users to templates area of new service instead of dashboard
-        service_id = invite_data["service"]
+        service_id = invite_data["service_id"]
         url = url_for(".service_dashboard", service_id=service_id)
         url = f"{url}/templates"
         return redirect(url)
diff --git a/app/notify_client/invite_api_client.py b/app/notify_client/invite_api_client.py
index 9184abbd1..f4a8538cd 100644
--- a/app/notify_client/invite_api_client.py
+++ b/app/notify_client/invite_api_client.py
@@ -62,7 +62,8 @@ class InviteApiClient(NotifyAdminAPIClient):
 
         resp_data = resp["data"]
         invite_data_key = f"invitedata-{unquote(state)}"
-        redis_invite_data = json.dumps(resp_data)
+        redis_invite_data = resp["invite"]
+        redis_invite_data = json.dumps(redis_invite_data)
         redis_client.set(invite_data_key, redis_invite_data)
 
         return resp_data
diff --git a/app/notify_client/user_api_client.py b/app/notify_client/user_api_client.py
index 01a3a78c9..3514a0d6e 100644
--- a/app/notify_client/user_api_client.py
+++ b/app/notify_client/user_api_client.py
@@ -168,7 +168,7 @@ class UserApiClient(NotifyAdminAPIClient):
     @cache.delete("user-{user_id}")
     def add_user_to_service(self, service_id, user_id, permissions, folder_permissions):
         # permissions passed in are the combined UI permissions, not DB permissions
-        endpoint = "/service/{}/users/{}".format(service_id, user_id)
+        endpoint = f"/service/{service_id}/users/{user_id}"
         data = {
             "permissions": [
                 {"permission": x}