diff --git a/apps/web/src/composables/users.ts b/apps/web/src/composables/users.ts
index 1c182e876..8474a917c 100644
--- a/apps/web/src/composables/users.ts
+++ b/apps/web/src/composables/users.ts
@@ -326,6 +326,17 @@ export default function useUsers () {
         return await fetch(`${usersBaseURL}/user/update-primary-account`, requestOptions)
     }
 
+    async function updateUserAgreement(agreed: boolean) {
+        const requestOptions = {
+            method: 'PUT',
+            headers: { 
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({ agreed })
+        }
+        return await fetch(`${usersBaseURL}/user/update-user-agreement/${user.value?.id}`, requestOptions)
+    }
+
     return {
         session,
         user: readonly(user),
@@ -341,6 +352,7 @@ export default function useUsers () {
         removeAccount,
         setUser,
         setUserAccountBalances,
-        updatePrimaryAddress
+        updatePrimaryAddress,
+        updateUserAgreement
     }
 }
\ No newline at end of file
diff --git a/apps/web/src/pages/overview/components/Staking.vue b/apps/web/src/pages/overview/components/Staking.vue
index 3dcb1bda0..e685efca2 100644
--- a/apps/web/src/pages/overview/components/Staking.vue
+++ b/apps/web/src/pages/overview/components/Staking.vue
@@ -11,7 +11,7 @@ import TermsOfService from '@/components/TermsOfService.vue'
 
 const { deposit, getDepositFees } = useContracts()
 const { getEthersBalance } = useEthers()
-const { user } = useUsers()
+const { user, updateUserAgreement } = useUsers()
 const { getCurrentPrice } = usePrice()
 
 const selectedProvider = ref<ProviderString>('')
@@ -140,6 +140,8 @@ watch(formattedAmountToStake, async () => {
 
 watch(user, () => {
   aggregateAddressesByProvider()
+  termsOfServiceCheckbox.value = user.value?.agreedToTermsOfService as boolean
+  console.log('user.value.agreedToTermsOfService :>> ', user.value?.agreedToTermsOfService)
 })
 
 onMounted(async () => {
@@ -344,6 +346,7 @@ const handleDeposit = async () => {
         v-model="termsOfServiceCheckbox"
         type="checkbox"
         class="card_checkbox"
+        @change="updateUserAgreement(termsOfServiceCheckbox)"
       > 
       <button
         id="termsOfServiceButton"
diff --git a/common/data/src/interfaces/JsonSchema.ts b/common/data/src/interfaces/JsonSchema.ts
index 5fd31a1cc..bf613e218 100644
--- a/common/data/src/interfaces/JsonSchema.ts
+++ b/common/data/src/interfaces/JsonSchema.ts
@@ -6,7 +6,8 @@ export interface JsonSchema {
     properties: {
         [key: string]: {
             type: string,
-            description: string
+            description: string,
+            default: string | number | boolean | null
         }
     },
     uniqueFields?: string[],
diff --git a/common/data/src/providers/schema.ts b/common/data/src/providers/schema.ts
index 3dfe359f0..7b016a943 100644
--- a/common/data/src/providers/schema.ts
+++ b/common/data/src/providers/schema.ts
@@ -84,7 +84,10 @@ export class Schema {
 
             const comment = property.description
             if (comment.includes('PK')) column += ' PRIMARY KEY'
-
+            
+            const defaultValue = property.default
+            if (defaultValue !== undefined) column += ` DEFAULT ${defaultValue}`
+            
             return column
         })
 
diff --git a/common/data/src/schemas/user.schema.json b/common/data/src/schemas/user.schema.json
index 9bc964364..c220370c6 100644
--- a/common/data/src/schemas/user.schema.json
+++ b/common/data/src/schemas/user.schema.json
@@ -20,6 +20,11 @@
             "type": "string",
             "description": "The account last update date in ISO 8601 format"
         },
+        "agreed_to_terms_of_service": {
+            "type": "boolean",
+            "description": "The user aggreement status",
+            "default": false
+        },
         "wallet_provider": {
             "type": "string",
             "description": "The wallet provider used set a primary user account"
@@ -30,6 +35,7 @@
         "created_at",
         "id",
         "updated_at",
+        "user_aggreement",
         "wallet_provider"
     ]
 }
\ No newline at end of file
diff --git a/common/types/src/interfaces/User.ts b/common/types/src/interfaces/User.ts
index 03bd1937e..b566b0c7b 100644
--- a/common/types/src/interfaces/User.ts
+++ b/common/types/src/interfaces/User.ts
@@ -12,6 +12,8 @@ export interface User {
     id: number
     /* ISO Timestamp of when user was last updated */
     updatedAt?: string
+    /* Did user agree to terms of service? */
+    agreedToTermsOfService: boolean
     /* Wallet provider (e.g. metamask) */
     walletProvider: ProviderString
 }
\ No newline at end of file
diff --git a/contracts/ethereum/docs/index.md b/contracts/ethereum/docs/index.md
index ffbadf017..d31f3b8ac 100644
--- a/contracts/ethereum/docs/index.md
+++ b/contracts/ethereum/docs/index.md
@@ -1,5 +1,49 @@
 # Solidity API
 
+## MockFunctionsOracle
+
+### constructor
+
+```solidity
+constructor() public
+```
+
+### getRegistry
+
+```solidity
+function getRegistry() external view returns (address)
+```
+
+Returns the address of the registry contract
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| [0] | address | address The address of the registry contract |
+
+### sendRequest
+
+```solidity
+function sendRequest(uint64 _subscriptionId, bytes _data, uint32 _gasLimit) external returns (bytes32 requestId)
+```
+
+Sends a request (encoded as data) using the provided subscriptionId
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| _subscriptionId | uint64 | A unique subscription ID allocated by billing system, a client can make requests from different contracts referencing the same subscription |
+| _data | bytes | Encoded Chainlink Functions request data, use FunctionsClient API to encode a request |
+| _gasLimit | uint32 | Gas limit for the fulfillment callback |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| requestId | bytes32 | A unique request identifier (unique per DON) |
+
 ## CasimirManager
 
 ### upkeepRegistrationMinimum
@@ -1214,152 +1258,6 @@ Fulfill the request for testing
 | response | bytes | Aggregated response from the user code |
 | err | bytes | Aggregated error from the user code or from the sweptStake pipeline Either response or error parameter will be set, but never both |
 
-## CasimirViews
-
-### constructor
-
-```solidity
-constructor(address managerAddress, address registryAddress) public
-```
-
-Constructor
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| managerAddress | address | The manager address |
-| registryAddress | address | The registry address |
-
-### getCompoundablePoolIds
-
-```solidity
-function getCompoundablePoolIds(uint256 startIndex, uint256 endIndex) external view returns (uint32[5] poolIds)
-```
-
-Get the next five compoundable pool IDs
-
-_Should be called off-chain_
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| startIndex | uint256 | The start index |
-| endIndex | uint256 | The end index |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| poolIds | uint32[5] | The next five compoundable pool IDs |
-
-### getOperators
-
-```solidity
-function getOperators(uint256 startIndex, uint256 endIndex) external view returns (struct ICasimirRegistry.Operator[])
-```
-
-Get operators
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| startIndex | uint256 | The start index |
-| endIndex | uint256 | The end index |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| [0] | struct ICasimirRegistry.Operator[] | operators The operators |
-
-### getPendingValidatorPublicKeys
-
-```solidity
-function getPendingValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
-```
-
-Get the pending validator public keys
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| startIndex | uint256 | The start index |
-| endIndex | uint256 | The end index |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| [0] | bytes[] | validatorPublicKeys The pending validator public keys |
-
-### getStakedValidatorPublicKeys
-
-```solidity
-function getStakedValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
-```
-
-Get the staked validator public keys
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| startIndex | uint256 | The start index |
-| endIndex | uint256 | The end index |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| [0] | bytes[] | validatorPublicKeys The staked validator public keys |
-
-### getPoolDetails
-
-```solidity
-function getPoolDetails(uint32 poolId) external view returns (struct ICasimirPool.PoolDetails poolDetails)
-```
-
-Get a pool's details by ID
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| poolId | uint32 | The pool ID |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| poolDetails | struct ICasimirPool.PoolDetails | The pool details |
-
-### getSweptBalance
-
-```solidity
-function getSweptBalance(uint256 startIndex, uint256 endIndex) public view returns (uint256 balance)
-```
-
-Get the swept balance
-
-_Should be called off-chain_
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| startIndex | uint256 | The start index |
-| endIndex | uint256 | The end index |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| balance | uint256 | The swept balance |
-
 ## ICasimirManager
 
 ### Token
@@ -2023,44 +1921,6 @@ method._
 | upkeepNeeded | bool | boolean to indicate whether the keeper should call performUpkeep or not. |
 | performData | bytes | bytes that the keeper should call performUpkeep with, if upkeep is needed. If you would like to encode data to decode later, try `abi.encode`. |
 
-## ICasimirViews
-
-### getCompoundablePoolIds
-
-```solidity
-function getCompoundablePoolIds(uint256 startIndex, uint256 endIndex) external view returns (uint32[5])
-```
-
-### getOperators
-
-```solidity
-function getOperators(uint256 startIndex, uint256 endIndex) external view returns (struct ICasimirRegistry.Operator[])
-```
-
-### getPoolDetails
-
-```solidity
-function getPoolDetails(uint32 poolId) external view returns (struct ICasimirPool.PoolDetails)
-```
-
-### getPendingValidatorPublicKeys
-
-```solidity
-function getPendingValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
-```
-
-### getStakedValidatorPublicKeys
-
-```solidity
-function getStakedValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
-```
-
-### getSweptBalance
-
-```solidity
-function getSweptBalance(uint256 startIndex, uint256 endIndex) external view returns (uint256)
-```
-
 ## Types32Array
 
 ### remove
@@ -2225,47 +2085,187 @@ struct RegistrationParams {
 function registerUpkeep(struct KeeperRegistrarInterface.RegistrationParams requestParams) external returns (uint256)
 ```
 
-## MockFunctionsOracle
+## CasimirViews
 
 ### constructor
 
 ```solidity
-constructor() public
+constructor(address managerAddress, address registryAddress) public
 ```
 
-### getRegistry
+Constructor
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| managerAddress | address | The manager address |
+| registryAddress | address | The registry address |
+
+### getCompoundablePoolIds
 
 ```solidity
-function getRegistry() external view returns (address)
+function getCompoundablePoolIds(uint256 startIndex, uint256 endIndex) external view returns (uint32[5] poolIds)
 ```
 
-Returns the address of the registry contract
+Get the next five compoundable pool IDs
+
+_Should be called off-chain_
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| startIndex | uint256 | The start index |
+| endIndex | uint256 | The end index |
 
 #### Return Values
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| [0] | address | address The address of the registry contract |
+| poolIds | uint32[5] | The next five compoundable pool IDs |
 
-### sendRequest
+### getOperators
 
 ```solidity
-function sendRequest(uint64 _subscriptionId, bytes _data, uint32 _gasLimit) external returns (bytes32 requestId)
+function getOperators(uint256 startIndex, uint256 endIndex) external view returns (struct ICasimirRegistry.Operator[])
 ```
 
-Sends a request (encoded as data) using the provided subscriptionId
+Get operators
 
 #### Parameters
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| _subscriptionId | uint64 | A unique subscription ID allocated by billing system, a client can make requests from different contracts referencing the same subscription |
-| _data | bytes | Encoded Chainlink Functions request data, use FunctionsClient API to encode a request |
-| _gasLimit | uint32 | Gas limit for the fulfillment callback |
+| startIndex | uint256 | The start index |
+| endIndex | uint256 | The end index |
 
 #### Return Values
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| requestId | bytes32 | A unique request identifier (unique per DON) |
+| [0] | struct ICasimirRegistry.Operator[] | operators The operators |
+
+### getPendingValidatorPublicKeys
+
+```solidity
+function getPendingValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
+```
+
+Get the pending validator public keys
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| startIndex | uint256 | The start index |
+| endIndex | uint256 | The end index |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| [0] | bytes[] | validatorPublicKeys The pending validator public keys |
+
+### getStakedValidatorPublicKeys
+
+```solidity
+function getStakedValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
+```
+
+Get the staked validator public keys
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| startIndex | uint256 | The start index |
+| endIndex | uint256 | The end index |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| [0] | bytes[] | validatorPublicKeys The staked validator public keys |
+
+### getPoolDetails
+
+```solidity
+function getPoolDetails(uint32 poolId) external view returns (struct ICasimirPool.PoolDetails poolDetails)
+```
+
+Get a pool's details by ID
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| poolId | uint32 | The pool ID |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| poolDetails | struct ICasimirPool.PoolDetails | The pool details |
+
+### getSweptBalance
+
+```solidity
+function getSweptBalance(uint256 startIndex, uint256 endIndex) public view returns (uint256 balance)
+```
+
+Get the swept balance
+
+_Should be called off-chain_
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| startIndex | uint256 | The start index |
+| endIndex | uint256 | The end index |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| balance | uint256 | The swept balance |
+
+## ICasimirViews
+
+### getCompoundablePoolIds
+
+```solidity
+function getCompoundablePoolIds(uint256 startIndex, uint256 endIndex) external view returns (uint32[5])
+```
+
+### getOperators
+
+```solidity
+function getOperators(uint256 startIndex, uint256 endIndex) external view returns (struct ICasimirRegistry.Operator[])
+```
+
+### getPoolDetails
+
+```solidity
+function getPoolDetails(uint32 poolId) external view returns (struct ICasimirPool.PoolDetails)
+```
+
+### getPendingValidatorPublicKeys
+
+```solidity
+function getPendingValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
+```
+
+### getStakedValidatorPublicKeys
+
+```solidity
+function getStakedValidatorPublicKeys(uint256 startIndex, uint256 endIndex) external view returns (bytes[])
+```
+
+### getSweptBalance
+
+```solidity
+function getSweptBalance(uint256 startIndex, uint256 endIndex) external view returns (uint256)
+```
 
diff --git a/services/users/src/providers/db.ts b/services/users/src/providers/db.ts
index 099db6e34..e1489b5ca 100644
--- a/services/users/src/providers/db.ts
+++ b/services/users/src/providers/db.ts
@@ -179,6 +179,29 @@ export default function useDB() {
         }
     }
 
+    /**
+     * Update user's agreedToTermsOfService based on userId.
+     * @param userId - The user's id
+     * @param agreedToTermsOfService - The user's new agreedToTermsOfService
+     * @returns A promise that resolves when the user's agreedToTermsOfService is updated
+     * @throws Error if the user is not found
+     * 
+     */
+    async function updateUserAgreedToTermsOfService(userId: number, agreedToTermsOfService: boolean): Promise<User> {
+        try {
+            const updated_at = new Date().toISOString()
+            const text = 'UPDATE users SET agreed_to_terms_of_service = $1, updated_at = $2 WHERE id = $3 RETURNING *;'
+            const params = [agreedToTermsOfService, updated_at, userId]
+            const rows = await postgres.query(text, params)
+            const user = rows[0]
+            if (!user) throw new Error('User not found.')
+            return user
+        } catch (error) {
+            console.error('There was an error updating the user agreedToTermsOfService in updateUserAgreedToTermsOfService.', error)
+            throw error
+        }
+    }
+
     /**
      * Add or update nonce for an address.
      * @param address - The address
@@ -245,6 +268,7 @@ export default function useDB() {
         getUserById,
         removeAccount, 
         updateUserAddress, 
+        updateUserAgreedToTermsOfService,
         upsertNonce 
     }
 }
\ No newline at end of file
diff --git a/services/users/src/routes/user.ts b/services/users/src/routes/user.ts
index 5452f2d03..7e9f12b83 100644
--- a/services/users/src/routes/user.ts
+++ b/services/users/src/routes/user.ts
@@ -4,7 +4,7 @@ import { SessionRequest } from 'supertokens-node/framework/express'
 import useDB from '../providers/db'
 
 const router = express.Router()
-const { addAccount, getAccounts, getUser, getUserById, updateUserAddress, removeAccount } = useDB()
+const { addAccount, getAccounts, getUser, getUserById, updateUserAddress, updateUserAgreedToTermsOfService, removeAccount } = useDB()
 
 router.get('/', verifySession(), async (req: SessionRequest, res: express.Response) => {
     try {
@@ -29,6 +29,41 @@ router.get('/', verifySession(), async (req: SessionRequest, res: express.Respon
     }
 })
 
+router.post('/add-sub-account', verifySession(), async (req: SessionRequest, res: express.Response) => {
+    try {
+        console.log('ADDING ACCOUNT!')
+        const { account } = req.body
+        const { ownerAddress } = account
+        const userSessionsAddress = req.session?.getUserId().toLowerCase()
+        const validatedAddress = validateAddress(userSessionsAddress, ownerAddress)
+        if (!validatedAddress) {
+            res.setHeader('Content-Type', 'application/json')
+            res.status(200)
+            res.json({
+                message: 'Address does not match session',
+                error: true,
+                data: null
+            })
+        }
+        await addAccount(account)
+        const user = await getUser(ownerAddress)
+        res.setHeader('Content-Type', 'application/json')
+        res.status(200)
+        res.json({
+            message: 'Account added',
+            error: false,
+            data: user
+        })
+    } catch (err) {
+        res.status(500)
+        res.json({
+            message: 'Error adding account',
+            error: true,
+            data: null
+        })
+    }
+})
+
 router.get('/check-if-primary-address-exists/:provider/:address', async (req: express.Request, res: express.Response) => {
     try {
         const { params } = req
@@ -90,41 +125,6 @@ router.get('/check-secondary-address/:address', async (req: express.Request, res
     }
 })
 
-router.post('/add-sub-account', verifySession(), async (req: SessionRequest, res: express.Response) => {
-    try {
-        console.log('ADDING ACCOUNT!')
-        const { account } = req.body
-        const { ownerAddress } = account
-        const userSessionsAddress = req.session?.getUserId().toLowerCase()
-        const validatedAddress = validateAddress(userSessionsAddress, ownerAddress)
-        if (!validatedAddress) {
-            res.setHeader('Content-Type', 'application/json')
-            res.status(200)
-            res.json({
-                message: 'Address does not match session',
-                error: true,
-                data: null
-            })
-        }
-        await addAccount(account)
-        const user = await getUser(ownerAddress)
-        res.setHeader('Content-Type', 'application/json')
-        res.status(200)
-        res.json({
-            message: 'Account added',
-            error: false,
-            data: user
-        })
-    } catch (err) {
-        res.status(500)
-        res.json({
-            message: 'Error adding account',
-            error: true,
-            data: null
-        })
-    }
-})
-
 router.post('/remove-sub-account', verifySession(), async (req: SessionRequest, res: express.Response) => {
     try {
         console.log('REMOVING ACCOUNT!')
@@ -197,6 +197,29 @@ router.put('/update-primary-account', verifySession(), async (req: SessionReques
     }
 })
 
+router.put('/update-user-agreement/:userId', verifySession(), async (req: SessionRequest, res: express.Response) => {
+    try {
+        const { agreed } = req.body
+        const { userId } = req.params
+        const userID = parseInt(userId)
+        const user = await updateUserAgreedToTermsOfService(userID, agreed)
+        res.setHeader('Content-Type', 'application/json')
+        res.status(200)
+        res.json({
+            message: 'User agreement updated',
+            error: false,
+            data: user
+        })
+    } catch (err) {
+        res.status(500)
+        res.json({
+            message: 'Error updating user agreement',
+            error: true,
+            data: null
+        })
+    }
+})
+
 function maskAddress(address: string) {
     return address.slice(0, 6) + '...' + address.slice(-4)
 }