diff --git a/src/layouts/BaseLayout/BaseLayout.spec.jsx b/src/layouts/BaseLayout/BaseLayout.spec.jsx
index ee55dabbc0..3221d75457 100644
--- a/src/layouts/BaseLayout/BaseLayout.spec.jsx
+++ b/src/layouts/BaseLayout/BaseLayout.spec.jsx
@@ -78,6 +78,7 @@ const internalUserHasSyncedProviders = {
       service: 'github',
     },
   ],
+  termsAgreement: false,
 }
 
 const queryClient = new QueryClient({
diff --git a/src/layouts/BaseLayout/hooks/useUserAccessGate.js b/src/layouts/BaseLayout/hooks/useUserAccessGate.js
index 08bdfdf1d0..c2bd947465 100644
--- a/src/layouts/BaseLayout/hooks/useUserAccessGate.js
+++ b/src/layouts/BaseLayout/hooks/useUserAccessGate.js
@@ -73,13 +73,8 @@ const useUserAccessGate = () => {
 
   // the undefined provider check can be removed when the ToS has
   // been refactored to no longer use a provider
-  if (
-    termsOfServicePage &&
-    !isUndefined(provider) &&
-    !isGuest &&
-    !config.IS_SELF_HOSTED
-  ) {
-    showAgreeToTerms = userData?.termsAgreement === false
+  if (termsOfServicePage && !isGuest && !config.IS_SELF_HOSTED) {
+    showAgreeToTerms = internalUser?.termsAgreement === false
   }
 
   const onSyncPage = currentRoute.path === '/sync'
diff --git a/src/layouts/BaseLayout/hooks/useUserAccessGate.spec.tsx b/src/layouts/BaseLayout/hooks/useUserAccessGate.spec.tsx
index 3f350f6cb5..b8f59be8d1 100644
--- a/src/layouts/BaseLayout/hooks/useUserAccessGate.spec.tsx
+++ b/src/layouts/BaseLayout/hooks/useUserAccessGate.spec.tsx
@@ -160,6 +160,30 @@ const internalUserHasSyncedProviders = {
   ],
 }
 
+const internalUserWithSignedTOS = {
+  email: userSignedInIdentity.email,
+  name: userSignedInIdentity.name,
+  externalId: '123',
+  owners: [
+    {
+      service: 'github',
+    },
+  ],
+  termsAgreement: true,
+}
+
+const internalUserWithUnsignedTOS = {
+  email: userSignedInIdentity.email,
+  name: userSignedInIdentity.name,
+  externalId: '123',
+  owners: [
+    {
+      service: 'github',
+    },
+  ],
+  termsAgreement: false,
+}
+
 type InternalUser =
   | typeof internalUserNoSyncedProviders
   | typeof internalUserHasSyncedProviders
@@ -249,7 +273,7 @@ describe('useUserAccessGate', () => {
       'signed TOS',
       {
         user: loggedInUser,
-        internalUser: internalUserHasSyncedProviders,
+        internalUser: internalUserWithSignedTOS,
         termsOfServicePage: true,
         isSelfHosted: false,
         defaultOrgSelectorPage: false,
@@ -361,7 +385,7 @@ describe('useUserAccessGate', () => {
       'unsigned TOS',
       {
         user: loggedInUnsignedUser,
-        internalUser: internalUserHasSyncedProviders,
+        internalUser: internalUserWithUnsignedTOS,
         termsOfServicePage: true,
         isSelfHosted: false,
         defaultOrgSelectorPage: false,
diff --git a/src/pages/TermsOfService/TermsOfService.jsx b/src/pages/TermsOfService/TermsOfService.jsx
index 1aacdc2f6d..9ac09789e4 100644
--- a/src/pages/TermsOfService/TermsOfService.jsx
+++ b/src/pages/TermsOfService/TermsOfService.jsx
@@ -5,7 +5,7 @@ import { useForm } from 'react-hook-form'
 import { z } from 'zod'
 
 import umbrellaSvg from 'assets/svg/umbrella.svg'
-import { useUser } from 'services/user'
+import { useInternalUser } from 'services/user'
 import A from 'ui/A'
 import Button from 'ui/Button'
 import TextInput from 'ui/TextInput'
@@ -18,8 +18,8 @@ const FormSchema = z.object({
   tos: z.literal(true),
 })
 
-function isDisabled({ isValid, isDirty }) {
-  return (!isValid && isDirty) || !isDirty
+function isDisabled({ isValid, isDirty, isMutationLoading }) {
+  return (!isValid && isDirty) || !isDirty || isMutationLoading
 }
 
 function EmailInput({ register, marketingEmailMessage, showEmailRequired }) {
@@ -61,7 +61,7 @@ export default function TermsOfService() {
       resolver: zodResolver(FormSchema),
       mode: 'onChange',
     })
-  const { mutate } = useSaveTermsAgreement({
+  const { mutate, isLoading: isMutationLoading } = useSaveTermsAgreement({
     onSuccess: ({ data }) => {
       if (data?.saveTermsAgreement?.error) {
         setError('apiError', data?.saveTermsAgreement?.error)
@@ -70,12 +70,13 @@ export default function TermsOfService() {
     },
     onError: (error) => setError('apiError', error),
   })
-  const { data: currentUser, isLoading: userIsLoading } = useUser()
+  const { data: currentUser, isLoading: userIsLoading } = useInternalUser()
 
   const onSubmit = (data) => {
     mutate({
       businessEmail: data?.marketingEmail || currentUser?.email,
       termsAgreement: true,
+      marketingConsent: data?.marketingConsent,
     })
   }
 
@@ -177,7 +178,7 @@ export default function TermsOfService() {
         )}
         <div className="mt-3 flex justify-end">
           <Button
-            disabled={isDisabled(formState)}
+            disabled={isDisabled(formState, isMutationLoading)}
             type="submit"
             hook="user signed tos"
           >
diff --git a/src/pages/TermsOfService/TermsOfService.spec.jsx b/src/pages/TermsOfService/TermsOfService.spec.jsx
index 4705eb5605..ce1fcc55bc 100644
--- a/src/pages/TermsOfService/TermsOfService.spec.jsx
+++ b/src/pages/TermsOfService/TermsOfService.spec.jsx
@@ -1,11 +1,13 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { graphql } from 'msw'
+import { graphql, rest } from 'msw'
 import { setupServer } from 'msw/node'
 import { Suspense } from 'react'
 import { MemoryRouter, Route } from 'react-router-dom'
 
+import { useFlags } from 'shared/featureFlags'
+
 import TermsOfService from './TermsOfService'
 
 const queryClient = new QueryClient({
@@ -14,12 +16,23 @@ const queryClient = new QueryClient({
 const server = setupServer()
 let errorMock
 
+let testLocation = {
+  pathname: '',
+}
+
 const wrapper = ({ children }) => (
   <QueryClientProvider client={queryClient}>
     <MemoryRouter initialEntries={['/gh/codecov/cool-repo']}>
       <Route path="/:provider/:owner/:repo">
         <Suspense fallback={null}>{children}</Suspense>
       </Route>
+      <Route
+        path="*"
+        render={({ location }) => {
+          testLocation = location
+          return null
+        }}
+      />
     </MemoryRouter>
   </QueryClientProvider>
 )
@@ -37,22 +50,37 @@ afterAll(() => {
   server.close()
 })
 
+const mockedUserData = {
+  email: null,
+  name: null,
+  externalId: null,
+  owners: [],
+  termsAgreement: false,
+}
+
+jest.mock('shared/featureFlags')
+
 describe('TermsOfService', () => {
   beforeEach(() => jest.resetModules())
 
   function setup({
-    useUserData,
+    internalUserData = mockedUserData,
     isValidationError = false,
     isUnAuthError = false,
     isUnknownError = false,
+    termsOfServicePageFlag = true,
   } = {}) {
     const mockMutationVariables = jest.fn()
     const user = userEvent.setup()
 
+    useFlags.mockReturnValue({
+      termsOfServicePage: termsOfServicePageFlag,
+    })
+
     server.use(
-      graphql.query('CurrentUser', (req, res, ctx) => {
-        return res(ctx.status(200), ctx.data(useUserData))
-      }),
+      rest.get('/internal/user', (req, res, ctx) =>
+        res(ctx.status(200), ctx.json(internalUserData))
+      ),
       graphql.mutation('SigningTermsAgreement', (req, res, ctx) => {
         mockMutationVariables(req.variables)
         if (isUnAuthError) {
@@ -176,16 +204,12 @@ describe('TermsOfService', () => {
     // that the correct inputs are being sent to the server.
     it('Sign TOS, sends the correct inputs to the server', async () => {
       const { user, mockMutationVariables } = setup({
-        useUserData: {
-          me: {
-            email: 'personal@cr.com',
-            trackingMetadata: {
-              ownerid: '1234',
-            },
-            user: {
-              username: 'chetney',
-            },
-          },
+        internalUserData: {
+          email: 'personal@cr.com',
+          name: 'Chetney',
+          externalId: '1234',
+          owners: [],
+          termsAgreement: false,
         },
       })
 
@@ -209,6 +233,7 @@ describe('TermsOfService', () => {
           tosInput: {
             businessEmail: 'personal@cr.com',
             termsAgreement: true,
+            marketingConsent: false,
           },
         })
       )
@@ -230,11 +255,9 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'user has email, signs TOS, submit is now enabled',
-        useUserData: {
-          me: {
-            email: 'personal@cr.com',
-            termsAgreement: false,
-          },
+        internalUserData: {
+          email: 'personal@cr.com',
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -247,11 +270,9 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'user wants to receive emails, signs TOS, submit is now enabled',
-        useUserData: {
-          me: {
-            email: 'chetney@cr.com',
-            termsAgreement: false,
-          },
+        internalUserData: {
+          email: 'chetney@cr.com',
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -265,11 +286,9 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'user has email, user wants to receive emails, signs TOS, submit is now enabled',
-        useUserData: {
-          me: {
-            email: 'chetney@cr.com',
-            termsAgreement: false,
-          },
+        internalUserData: {
+          email: 'chetney@cr.com',
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -284,11 +303,9 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'signs TOS, decides not to, is warned they must sign and cannot submit',
-        useUserData: {
-          me: {
-            email: 'chetney@cr.com',
-            termsAgreement: false,
-          },
+        internalUserData: {
+          email: 'chetney@cr.com',
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -304,10 +321,8 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'user checks marketing consent and is required to provide an email, sign TOS (check email validation messages)',
-        useUserData: {
-          me: {
-            termsAgreement: false,
-          },
+        internalUserData: {
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -329,10 +344,8 @@ describe('TermsOfService', () => {
       {
         validationDescription:
           'user checks marketing consent and does not provide an email, sign TOS (check email validation messages)',
-        useUserData: {
-          me: {
-            termsAgreement: false,
-          },
+        internalUserData: {
+          termsAgreement: false,
         },
       },
       [expectPageIsReady],
@@ -346,11 +359,9 @@ describe('TermsOfService', () => {
       {
         validationDescription: 'server unknown error notification',
         isUnknownError: true,
-        useUserData: {
-          me: {
-            termsAgreement: false,
-            email: 'personal@cr.com',
-          },
+        internalUserData: {
+          termsAgreement: false,
+          email: 'personal@cr.com',
         },
       },
       [expectPageIsReady],
@@ -375,11 +386,9 @@ describe('TermsOfService', () => {
       {
         validationDescription: 'server failure error notification',
         isUnAuthError: true,
-        useUserData: {
-          me: {
-            termsAgreement: false,
-            email: 'personal@cr.com',
-          },
+        internalUserData: {
+          termsAgreement: false,
+          email: 'personal@cr.com',
         },
       },
       [expectPageIsReady],
@@ -399,11 +408,9 @@ describe('TermsOfService', () => {
         validationDescription:
           'server validation error notification (saveTerms)',
         isValidationError: true,
-        useUserData: {
-          me: {
-            termsAgreement: false,
-            email: 'personal@cr.com',
-          },
+        internalUserData: {
+          termsAgreement: false,
+          email: 'personal@cr.com',
         },
       },
       [expectPageIsReady],
@@ -411,6 +418,20 @@ describe('TermsOfService', () => {
       [expectClickSubmit],
       [expectRendersServerFailureResult, 'validation error'],
     ],
+    [
+      'case #10',
+      {
+        validationDescription:
+          'redirects to main root if user has already synced a provider',
+        isValidationError: true,
+        internalUserData: {
+          termsAgreement: true,
+          email: '',
+          owners: [{ service: 'github', username: 'chetney' }],
+        },
+      },
+      [expectRedirectTo, '/gh/codecov/cool-repo'],
+    ],
   ])('form validation, %s', (_, initializeTest, ...steps) => {
     beforeEach(() => {
       const spy = jest.spyOn(console, 'error')
@@ -423,9 +444,9 @@ describe('TermsOfService', () => {
     })
 
     describe(`
-      Has signed in: ${!!initializeTest.useUserData.me}
-      Has a email via oauth: ${initializeTest.useUserData.me?.email}
-    `, () => {
+        Has signed in: ${!!initializeTest.internalUserData}
+        Has a email via oauth: ${initializeTest.internalUserData?.email}
+      `, () => {
       jest.mock('./hooks/useTermsOfService', () => ({
         useSaveTermsAgreement: jest.fn(() => ({ data: 'mocked' })),
       }))
@@ -435,7 +456,7 @@ describe('TermsOfService', () => {
           isUnknownError: initializeTest.isUnknownError,
           isValidationError: initializeTest.isValidationError,
           isUnAuthError: initializeTest.isUnAuthError,
-          useUserData: initializeTest.useUserData,
+          internalUserData: initializeTest.internalUserData,
         })
         render(<TermsOfService />, { wrapper })
 
@@ -552,3 +573,7 @@ async function expectRendersServerFailureResult(user, expectedError = {}) {
   expect(issueLink).toBeInTheDocument()
   expect(issueLink.href).toBe('https://codecovpro.zendesk.com/hc/en-us')
 }
+
+async function expectRedirectTo(user, to) {
+  await waitFor(() => expect(testLocation.pathname).toBe(to))
+}
diff --git a/src/pages/TermsOfService/hooks/useTermsOfService.spec.tsx b/src/pages/TermsOfService/hooks/useTermsOfService.spec.tsx
index ff4b0a3a80..61d535d6e1 100644
--- a/src/pages/TermsOfService/hooks/useTermsOfService.spec.tsx
+++ b/src/pages/TermsOfService/hooks/useTermsOfService.spec.tsx
@@ -89,7 +89,9 @@ describe('useSaveTermsAgreement', () => {
 
         await waitFor(() => expect(successFn).toBeCalledWith('completed'))
 
-        expect(invalidateQueries).toHaveBeenCalledWith(['currentUser', 'gh'])
+        expect(invalidateQueries).toHaveBeenCalledWith({
+          queryKey: ['InternalUser'],
+        })
       })
     })
 
@@ -113,12 +115,13 @@ describe('useSaveTermsAgreement', () => {
         result.current.mutate({
           businessEmail: 'test@test.com',
           termsAgreement: true,
-          defaultOrg: 'codecov',
         })
 
         await waitFor(() => expect(successFn).toBeCalledWith('completed'))
 
-        expect(invalidateQueries).toHaveBeenCalledWith(['currentUser', 'gh'])
+        expect(invalidateQueries).toHaveBeenCalledWith({
+          queryKey: ['InternalUser'],
+        })
       })
     })
 
@@ -147,9 +150,7 @@ describe('useSaveTermsAgreement', () => {
         })
 
         await waitFor(() =>
-          expect(spyErrorMock).toBeCalledWith(
-            'POST /graphql/gh net::ERR_FAILED'
-          )
+          expect(spyErrorMock).toBeCalledWith('POST /graphql/ net::ERR_FAILED')
         )
 
         expect(errorFn).toBeCalledWith('error')
diff --git a/src/pages/TermsOfService/hooks/useTermsOfService.ts b/src/pages/TermsOfService/hooks/useTermsOfService.ts
index e6da5416a6..adbed66676 100644
--- a/src/pages/TermsOfService/hooks/useTermsOfService.ts
+++ b/src/pages/TermsOfService/hooks/useTermsOfService.ts
@@ -1,14 +1,12 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { useParams } from 'react-router-dom'
 import { z } from 'zod'
 
 import Api from 'shared/api'
-import { assertIsString } from 'shared/asserts'
 
 const SaveTermsAgreementInputConfig = z.object({
-  businessEmail: z.string(),
+  businessEmail: z.string().optional(),
   termsAgreement: z.boolean(),
-  defaultOrg: z.string().nullish().optional(),
+  marketingConsent: z.boolean().optional(),
 })
 
 export type SaveTermsAgreementInput = z.infer<
@@ -21,29 +19,28 @@ const ResolverError = z.object({
   message: z.string(),
 })
 const SaveTermsAgreementPayloadConfig = z.object({
-  error: z.union([ResolverError, ResolverError]).nullish(),
+  data: z.object({
+    saveTermsAgreement: z.object({
+      error: z.union([ResolverError, ResolverError]).nullish(),
+    }),
+  }),
 })
 export type SaveTermsAgreementPayload = z.infer<
   typeof SaveTermsAgreementPayloadConfig
 >
 
-interface Params {
-  provider?: string
-}
 interface SaveTermsAgreementOptions {
   onSuccess?: (data: SaveTermsAgreementPayload) => void
-  onError?: () => void
+  onError?: (error: Error) => void
 }
 export function useSaveTermsAgreement(options: SaveTermsAgreementOptions = {}) {
-  const { provider } = useParams<Params>()
   const queryClient = useQueryClient()
   const { onSuccess, ...rest } = options
   return useMutation({
     mutationFn: (input: SaveTermsAgreementInput) => {
       const parsedInput = SaveTermsAgreementInputConfig.parse(input)
-      assertIsString(provider)
 
-      const { businessEmail, defaultOrg, termsAgreement } = parsedInput
+      const { businessEmail, termsAgreement, marketingConsent } = parsedInput
 
       const querySignAgreement = `
         mutation SigningTermsAgreement($tosInput: SaveTermsAgreementInput!) {
@@ -58,50 +55,18 @@ export function useSaveTermsAgreement(options: SaveTermsAgreementOptions = {}) {
         }
       `
 
-      const queryWithDefaultOrg = `
-        mutation SigningTermsAgreement($tosInput: SaveTermsAgreementInput!, $defaultOrgInput: UpdateDefaultOrganizationInput!) {
-          saveTermsAgreement(input: $tosInput) {
-            error {
-              __typename
-              ... on ResolverError {
-                message
-              }
-            }
-          }
-          updateDefaultOrganization(input: $defaultOrgInput) {
-            error {
-              __typename
-              ... on ResolverError {
-                message
-              }
-            }
-          }
-        }
-      `
-
-      if (defaultOrg) {
-        const variables = {
-          tosInput: { businessEmail, termsAgreement },
-          defaultOrgInput: { username: defaultOrg },
-        }
-        return Api.graphqlMutation({
-          mutationPath: 'saveTermsAgreement',
-          provider,
-          query: queryWithDefaultOrg,
-          variables,
-        })
+      const variables = {
+        tosInput: { businessEmail, termsAgreement, marketingConsent },
       }
-
-      const variables = { tosInput: { businessEmail, termsAgreement } }
       return Api.graphqlMutation({
         mutationPath: 'saveTermsAgreement',
-        provider,
         query: querySignAgreement,
         variables,
+        supportsServiceless: true,
       })
     },
     onSuccess: (data) => {
-      queryClient.invalidateQueries(['currentUser', provider])
+      queryClient.invalidateQueries({ queryKey: ['InternalUser'] })
       onSuccess && onSuccess(data)
     },
     ...rest,
diff --git a/src/services/user/useInternalUser.ts b/src/services/user/useInternalUser.ts
index 5e22bba3ae..7aff7987f7 100644
--- a/src/services/user/useInternalUser.ts
+++ b/src/services/user/useInternalUser.ts
@@ -27,6 +27,7 @@ const InternalUserSchema = z
     name: z.string().nullish(),
     externalId: z.string().nullish(),
     owners: z.array(OwnerSchema).nullish(),
+    termsAgreement: z.boolean().nullish(),
   })
   .nullish()
 
diff --git a/src/shared/api/api.js b/src/shared/api/api.js
index f9a70754f1..73de6b8197 100644
--- a/src/shared/api/api.js
+++ b/src/shared/api/api.js
@@ -55,8 +55,19 @@ function prefillMethod(method) {
     })
 }
 
-function graphql({ provider, query, variables = {}, signal }) {
-  const uri = `${config.API_URL}/graphql/${provider}`
+function graphql({
+  provider,
+  query,
+  variables = {},
+  signal,
+  supportsServiceless = false,
+}) {
+  let uri = `${config.API_URL}/graphql/${provider}`
+
+  if (supportsServiceless && !provider) {
+    uri = `${config.API_URL}/graphql/`
+  }
+
   const headers = {
     Accept: 'application/json',
     'Content-Type': 'application/json; charset=utf-8',
diff --git a/src/shared/api/api.test.js b/src/shared/api/api.test.js
index 904905e13a..6d3f3b47bd 100644
--- a/src/shared/api/api.test.js
+++ b/src/shared/api/api.test.js
@@ -320,4 +320,22 @@ describe('when using a graphql mutation', () => {
       })
     })
   })
+
+  describe('when the mutation supports serviceless', () => {
+    beforeAll(() => {
+      result = Api.graphqlMutation({
+        query: 'query MyInfo { me }',
+        mutationPath: 'me',
+        supportsServiceless: true,
+      })
+    })
+
+    it('resolves with the data', async () => {
+      return expect(result).resolves.toEqual({
+        data: {
+          me: 'Codecov',
+        },
+      })
+    })
+  })
 })