diff --git a/content/pages/startComputeDataset.json b/content/pages/startComputeDataset.json
index c98138b87..64f59a1f2 100644
--- a/content/pages/startComputeDataset.json
+++ b/content/pages/startComputeDataset.json
@@ -26,8 +26,8 @@
     },
     "assetTermsAndConditions": {
       "name": "assetTermsAndConditions",
-      "options": ["Asset Terms and Conditions"],
-      "prefixes": ["I agree to the"]
+      "prefixes": ["I acknowledge that the asset is made available under"],
+      "postfixes": ["license and agree to the terms"]
     }
   }
 }
diff --git a/content/pages/startDownloadDataset.json b/content/pages/startDownloadDataset.json
index cbaac5217..c5fd7e94f 100644
--- a/content/pages/startDownloadDataset.json
+++ b/content/pages/startDownloadDataset.json
@@ -7,8 +7,8 @@
     },
     "assetTermsAndConditions": {
       "name": "assetTermsAndConditions",
-      "options": ["Asset Terms and Conditions"],
-      "prefixes": ["I agree to the"]
+      "prefixes": ["I acknowledge that the asset is made available under"],
+      "postfixes": ["license and agree to the terms"]
     }
   }
 }
diff --git a/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx b/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx
index 3d9e9b77f..e54359a05 100644
--- a/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx
+++ b/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx
@@ -397,7 +397,7 @@ export default function FormStartCompute({
       />
       <TermsAndConditionsCheckbox
         {...content.form.portalTermsAndConditions}
-        actions={[appConfig.defaultTermsAndConditionsUrl]}
+        licenses={[appConfig.defaultTermsAndConditionsUrl]}
         disabled={isLoading}
         onChange={() =>
           setPortalTermsAndConditions(
@@ -407,7 +407,7 @@ export default function FormStartCompute({
       />
       <TermsAndConditionsCheckbox
         {...content.form.assetTermsAndConditions}
-        actions={[asset?.metadata?.license]}
+        licenses={[asset?.metadata?.license]}
         disabled={isLoading}
         onChange={() =>
           setAssetTermsAndConditions(
diff --git a/src/components/Asset/AssetActions/Download/index.tsx b/src/components/Asset/AssetActions/Download/index.tsx
index bd98ae7a2..7cc12ce7f 100644
--- a/src/components/Asset/AssetActions/Download/index.tsx
+++ b/src/components/Asset/AssetActions/Download/index.tsx
@@ -333,12 +333,12 @@ export default function Download({
                 )}
                 <TermsAndConditionsCheckbox
                   {...content.form.portalTermsAndConditions}
-                  actions={[defaultTermsAndConditionsUrl]}
+                  licenses={[defaultTermsAndConditionsUrl]}
                   disabled={isLoading}
                 />
                 <TermsAndConditionsCheckbox
                   {...content.form.assetTermsAndConditions}
-                  actions={[asset?.metadata?.license]}
+                  licenses={[asset?.metadata?.license]}
                   disabled={isLoading}
                 />
               </div>
diff --git a/src/components/Asset/AssetActions/TermsAndConditionsCheckbox.tsx b/src/components/Asset/AssetActions/TermsAndConditionsCheckbox.tsx
index 22efb9e0c..a2e73d942 100644
--- a/src/components/Asset/AssetActions/TermsAndConditionsCheckbox.tsx
+++ b/src/components/Asset/AssetActions/TermsAndConditionsCheckbox.tsx
@@ -4,26 +4,34 @@ import styles from './index.module.css'
 
 export default function TermsAndConditionsCheckbox({
   name,
-  actions,
+  licenses,
   onChange,
   disabled,
   options,
-  prefixes
+  prefixes,
+  postfixes
 }: {
   name: string
-  actions: any
+  licenses: string[]
   onChange?: (termsAndConditions: boolean) => void
   disabled: boolean
-  options: string[]
+  options?: string[]
   prefixes: string[]
+  postfixes?: string[]
 }) {
   return (
     <Field
       name={name}
       type="checkbox"
-      options={options}
+      options={
+        options ||
+        licenses.map((option) =>
+          option.includes('http') ? 'a custom' : `the ${option}`
+        )
+      }
       prefixes={prefixes}
-      actions={actions}
+      postfixes={postfixes}
+      actions={licenses?.filter((action) => action.includes('http'))}
       component={Input}
       disabled={disabled}
       {...(onChange && { onChange })}