diff --git a/CHANGELOG.md b/CHANGELOG.md
index 269ae7e0d..a825fd911 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,39 +2,65 @@
 
 ## Unreleased
 
-### Bugfix
+### Change
+
+- Page headers
+  - harmonization and standardization of page headers, added consistent headers and removed unused code
+
+### Feature
+
+- Use scroll to top button from shared components
+
+### Bugfixes
 
-- Overlay
-  - Fix consistency issue in overlays where form input is used
-- Company Wallet
-  - Use appropriate path to display logo on cards
-- App Subscription
-  - Register URL changes for Autosetup
-- Refactor
-  - Remove unnecessary import of Typography, Dialog and Circular Progress from mui and use those from shared-components
-- Connector Management
-  - fetch details using api, added permissions and fixed error messages
-- App Release Process
-  - Integrated role deletion with BE api reponse
-- Company Application Registraion Detail Overlay
-  - UI improvements
-  - Add correct registration application checklist items
 - Fixed incorrect usage of pre-commit hook
 - Fix consistency issue in constants file. Use camel case for all page paths. Update corresponding usage in other files
 
+## 2.1.0-RC1
+
+### Change
+
+- **Scroll Integration**:
+  - integrated now scroll-to-top component from shared components for all pages [#872](https://github.com/eclipse-tractusx/portal-frontend/pull/872)
+- **Credential Request**:
+  - UI improvements such as table headers, joint table columns, type updates, etc. [#866](https://github.com/eclipse-tractusx/portal-frontend/pull/866)
+
 ### Feature
 
-- Admin Credential
-  - Credential Request Management Board Improvements
-- Company data
-  - New company data page created
-  - Connect to the gate api to fetch the records
-  - Create and Edit address/site feature introduced
-- App marketplace
-  - Add more and collapse button to category view
-- Page headers
-  - harmonization and standardization of page headers, added consistent headers and removed unused code
-- Use scroll to top button from shared components
+- **Company Role**:
+  - added support for optional terms [#879](https://github.com/eclipse-tractusx/portal-frontend/pull/879)
+- **Company Data Management**:
+  - released Company data management page for Legal Entity, Sites and Addresses incl. simple status management [#731](https://github.com/eclipse-tractusx/portal-frontend/pull/731)
+- **Connector Management**:
+  - released connector detail view including change connector url, view SD document, etc. Add details overlay [#848](https://github.com/eclipse-tractusx/portal-frontend/pull/848)
+
+### Technical Maintenance
+
+- **Dependencies**:
+  - bumped GitHub actions [#846](https://github.com/eclipse-tractusx/portal-frontend/pull/846)
+- **Refactoring**:
+  - removed direct imports from MUI [#855](https://github.com/eclipse-tractusx/portal-frontend/pull/855)
+
+### Bugfixes
+
+- **PartnerNetwork Registration OSP**:
+  - fixed access to customer registration consent UI for OSP customers [#913](https://github.com/eclipse-tractusx/portal-frontend/pull/913)
+- **App Subscription**:
+  - allowed empty URL in register URL overlay [#842](https://github.com/eclipse-tractusx/portal-frontend/pull/842)
+- **Registration Detail**:
+  - fixed translation of registration process flow technical keys – Credential and BPNL Credential [#862](https://github.com/eclipse-tractusx/portal-frontend/pull/862)
+- **App Release Process**:
+  - integrated missing app release process `app role deletion` function with BE API response [#850](https://github.com/eclipse-tractusx/portal-frontend/pull/850)
+- **Company Wallet**:
+  - fixed transaction logo path [#845](https://github.com/eclipse-tractusx/portal-frontend/pull/845)
+- **Overlays**:
+  - fixed consistency for form input fields across the application [#843](https://github.com/eclipse-tractusx/portal-frontend/pull/843)
+- **My Organization View**:
+  - fixed permission validation for `my organization` view [#857](https://github.com/eclipse-tractusx/portal-frontend/pull/857)
+- **App Marketplace**:
+  - fixed app category view more and collapse button function [#805](https://github.com/eclipse-tractusx/portal-frontend/pull/805)
+- **Connector Management**:
+  - fixed blank page issue on clicking on details [#925](https://github.com/eclipse-tractusx/portal-frontend/pull/925)
 
 ## 2.0.0
 
diff --git a/package.json b/package.json
index dfeb9b311..df05dc07a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v2.0.0",
+  "version": "v2.1.0-RC1",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
index 32a25e446..d763ec012 100644
--- a/src/assets/locales/de/main.json
+++ b/src/assets/locales/de/main.json
@@ -1847,6 +1847,8 @@
         "companyInfo": "Company Info",
         "certificate": "Zertifikat",
         "document": "Dokumente",
+        "status": "Status",
+        "action": "Aktion",
         "type": {
           "TRACEABILITY_FRAMEWORK": "Traceability",
           "PCF_FRAMEWORK": "PCF Framework",
diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
index 42a4c81e4..269ff3323 100644
--- a/src/assets/locales/en/main.json
+++ b/src/assets/locales/en/main.json
@@ -1923,6 +1923,8 @@
         "companyInfo": "Company Info",
         "certificate": "Certificate",
         "document": "Document",
+        "status": "Status",
+        "action": "Action",
         "type": {
           "TRACEABILITY_FRAMEWORK": "Traceability",
           "PCF_FRAMEWORK": "PCF Framework",
diff --git a/src/components/Main.tsx b/src/components/Main.tsx
index c9f796691..2ed84929d 100644
--- a/src/components/Main.tsx
+++ b/src/components/Main.tsx
@@ -67,7 +67,7 @@ export default function Main() {
   }, [dispatch, searchParams])
 
   if (location.pathname === `/${PAGES.REGISTRATION}`)
-    return <Redirect path="registration" />
+    return <Redirect path={PAGES.REGISTRATION} />
 
   if (
     companyData &&
@@ -79,13 +79,17 @@ export default function Main() {
       ApplicationStatus.UPLOAD_DOCUMENTS,
       ApplicationStatus.VERIFY,
     ].includes(companyData.applicationStatus) &&
-    !location.search.includes('overlay=consent_osp')
+    location.pathname !== `/${PAGES.CONSENT_OSP}`
   ) {
     return (
       <>
         <Header main={[]} user={AccessService.userMenuReg()} />
         <MainSearchOverlay />
-        {location.pathname === '/logout' ? <Logout /> : renderSection()}
+        {location.pathname === `/${PAGES.LOGOUT}` ? (
+          <Logout />
+        ) : (
+          renderSection()
+        )}
         <Footer pages={AccessService.footerMenu()} />
         <MenuInfo main={[]} />
       </>
diff --git a/src/components/overlays/OSPConsent/OSPConsentContent.tsx b/src/components/overlays/OSPConsent/OSPConsentContent.tsx
deleted file mode 100644
index 8dcd41ddc..000000000
--- a/src/components/overlays/OSPConsent/OSPConsentContent.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-import { Checkbox, Typography } from '@catena-x/portal-shared-components'
-import {
-  CONSENT_STATUS,
-  type CompanyRole,
-  type CompanyRoleAgreementData,
-  type PartnerRegistrationConsent,
-  type PartnerRegistration,
-} from 'features/admin/networkApiSlice'
-import i18next from 'i18next'
-import { useState } from 'react'
-import { getHeaders } from 'services/RequestService'
-import { getApiBase } from 'services/EnvironmentService'
-import './style.scss'
-import { download } from 'utils/downloadUtils'
-
-const DocumentDownloadLink = ({ id, name }: { id: string; name: string }) => {
-  const onClick = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-    e.preventDefault()
-    fetch(
-      `${getApiBase()}/api/administration/registration/documents/${id}`,
-      getHeaders()
-    )
-      .then(async (res) => {
-        const fileType = res.headers.get('content-type') ?? ''
-        const file = await res.blob()
-        download(file, fileType, name)
-      })
-      .catch((error) => {
-        console.log(error)
-      })
-  }
-
-  return (
-    <a href={'#'} onClick={onClick}>
-      [doc]
-    </a>
-  )
-}
-
-const OSPConsentContentForm = ({
-  application,
-  companyRoleAgreementData,
-  onChange,
-}: {
-  application: PartnerRegistration
-  companyRoleAgreementData: CompanyRoleAgreementData
-  onChange: (consent: Set<string>) => void
-}) => {
-  const [consent, setConsent] = useState<Set<string>>(
-    new Set<string>(
-      application.agreements?.map((agreement) => agreement.agreementId)
-    )
-  )
-
-  const toggleConsent = (id: string) => {
-    const newConsent = new Set<string>(consent)
-    if (newConsent.has(id)) {
-      newConsent.delete(id)
-    } else {
-      newConsent.add(id)
-    }
-    setConsent(newConsent)
-    onChange(newConsent)
-  }
-
-  return (
-    <ul className={'roles'}>
-      {companyRoleAgreementData.companyRoles
-        .filter((role) => application.companyRoles.includes(role.companyRole))
-        .map((role: CompanyRole) => (
-          <li key={role.companyRole}>
-            <Typography variant="label3">{role.companyRole}</Typography>
-            <div>{role.descriptions[i18next.language]}</div>
-            <ul className={'agreements'}>
-              {role.agreementIds.map((id) => {
-                const agreement = companyRoleAgreementData.agreements.filter(
-                  (a) => id === a.agreementId
-                )?.[0]
-                return agreement ? (
-                  <li key={id}>
-                    <Checkbox
-                      label={agreement.name}
-                      onChange={() => {
-                        toggleConsent(agreement.agreementId)
-                      }}
-                      checked={consent.has(agreement.agreementId)}
-                    />
-                    <DocumentDownloadLink id={id} name={agreement.name} />
-                  </li>
-                ) : (
-                  <></>
-                )
-              })}
-            </ul>
-          </li>
-        ))}
-    </ul>
-  )
-}
-
-export const OSPConsentContent = ({
-  application,
-  companyRoleAgreementData,
-  onValid,
-}: {
-  application: PartnerRegistration
-  companyRoleAgreementData: CompanyRoleAgreementData
-  onValid: (consent: PartnerRegistrationConsent) => void
-}) => {
-  const [debug, setDebug] = useState<boolean>(false)
-  const toggleDebug = () => {
-    setDebug(!debug)
-  }
-
-  const doCheckData = (consent: Set<string>) => {
-    onValid({
-      companyRoles: application.companyRoles,
-      agreements: [...consent].map((agreementId) => ({
-        agreementId,
-        consentStatus: CONSENT_STATUS.ACTIVE,
-      })),
-    })
-  }
-
-  return (
-    <div>
-      <pre
-        style={{
-          fontSize: '10px',
-          backgroundColor: '#eeeeee',
-          cursor: 'pointer',
-        }}
-      >
-        {JSON.stringify(application, null, 2)}
-      </pre>
-      <OSPConsentContentForm
-        application={application}
-        companyRoleAgreementData={companyRoleAgreementData}
-        onChange={doCheckData}
-      />
-      <pre
-        style={{
-          fontSize: '10px',
-          backgroundColor: '#eeeeee',
-          cursor: 'pointer',
-        }}
-        onClick={toggleDebug}
-        onKeyUp={toggleDebug}
-      >
-        {debug ? JSON.stringify(companyRoleAgreementData, null, 2) : '{...}'}
-      </pre>
-    </div>
-  )
-}
diff --git a/src/components/overlays/OSPConsent/index.tsx b/src/components/overlays/OSPConsent/index.tsx
deleted file mode 100644
index 2c50bbe47..000000000
--- a/src/components/overlays/OSPConsent/index.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-import { Trans, useTranslation } from 'react-i18next'
-import {
-  Button,
-  DialogActions,
-  DialogContent,
-  DialogHeader,
-  LoadingButton,
-  Typography,
-} from '@catena-x/portal-shared-components'
-import { useDispatch } from 'react-redux'
-import { closeOverlay } from 'features/control/overlay'
-import { useEffect, useState } from 'react'
-import { OSPConsentContent } from './OSPConsentContent'
-import { error, success } from 'services/NotifyService'
-import {
-  type PartnerRegistrationConsent,
-  useFetchCompanyRoleAgreementDataQuery,
-  useRegisterPartnerConsentMutation,
-  emptyPartnerRegistrationConsent,
-  useFetchRegistrationApplicationsQuery,
-  useFetchRegistrationApplicationDataQuery,
-  REGISTRATION_APPLICATION_STATUS,
-} from 'features/admin/networkApiSlice'
-
-export const OSPApplicationConsent = ({ id }: { id: string }) => {
-  const { t } = useTranslation('idp')
-  const dispatch = useDispatch()
-  const application = useFetchRegistrationApplicationDataQuery(id).data
-  const companyRoleAgreementData = useFetchCompanyRoleAgreementDataQuery().data
-  const [registerPartnerConsent] = useRegisterPartnerConsentMutation()
-  const [consent, setConsent] = useState<PartnerRegistrationConsent>(
-    emptyPartnerRegistrationConsent
-  )
-  const [loading, setLoading] = useState(false)
-
-  console.log(application, companyRoleAgreementData)
-
-  const doConsent = async () => {
-    if (!(application && consent)) return
-    setLoading(true)
-    try {
-      console.log(consent)
-      await registerPartnerConsent(consent).unwrap()
-      success(t('osp.consent.success'))
-      dispatch(closeOverlay())
-    } catch (err) {
-      error(t('osp.consent.error'), '', err as object)
-    }
-    setLoading(false)
-  }
-
-  return (
-    <>
-      <DialogHeader
-        title={t('osp.consent.title')}
-        intro=""
-        closeWithIcon={true}
-        onCloseWithIcon={() => dispatch(closeOverlay())}
-      />
-      <DialogContent>
-        <div style={{ textAlign: 'center', marginBottom: '30px' }}>
-          <Trans>
-            <Typography variant="label3">{t('osp.consent.desc')}</Typography>
-          </Trans>
-        </div>
-        {application && companyRoleAgreementData && (
-          <OSPConsentContent
-            application={application}
-            companyRoleAgreementData={companyRoleAgreementData}
-            onValid={setConsent}
-          />
-        )}
-      </DialogContent>
-      <DialogActions>
-        <Button onClick={() => dispatch(closeOverlay())} variant="outlined">
-          {t('action.cancel')}
-        </Button>
-        {loading ? (
-          <LoadingButton
-            color="primary"
-            size="medium"
-            helperText=""
-            helperTextColor="success"
-            label=""
-            loading
-            loadIndicator={t('action.loading')}
-            onButtonClick={() => {
-              // do nothing
-            }}
-            sx={{ marginLeft: '10px' }}
-          />
-        ) : (
-          <Button
-            variant="contained"
-            onClick={doConsent}
-            disabled={
-              consent.agreements.length !==
-              companyRoleAgreementData?.companyRoles
-                .filter((role) =>
-                  application?.companyRoles.includes(role.companyRole)
-                )
-                .reduce((a, r) => a + r.agreementIds.length, 0)
-            }
-          >
-            {t('action.consent')}
-          </Button>
-        )}
-      </DialogActions>
-    </>
-  )
-}
-
-export const OSPConsent = () => {
-  const dispatch = useDispatch()
-  const { data: applications, refetch } =
-    useFetchRegistrationApplicationsQuery()
-
-  useEffect(() => {
-    refetch()
-    if (
-      applications &&
-      applications?.length > 0 &&
-      applications[0].applicationStatus ===
-        REGISTRATION_APPLICATION_STATUS.SUBMITTED
-    )
-      dispatch(closeOverlay())
-  }, [refetch, applications])
-
-  return applications && applications.length > 0 ? (
-    <OSPApplicationConsent id={applications[0].applicationId} />
-  ) : (
-    <></>
-  )
-}
diff --git a/src/components/overlays/OSPConsent/style.scss b/src/components/overlays/OSPConsent/style.scss
deleted file mode 100644
index 998a231a9..000000000
--- a/src/components/overlays/OSPConsent/style.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-ul.roles {
-  list-style-type: none;
-  padding-inline-start: 0;
-}
-
-ul.roles > li {
-  margin: 20px 0;
-}
-
-ul.agreements {
-  list-style-type: none;
-}
diff --git a/src/components/overlays/UpdateCompanyRole/index.tsx b/src/components/overlays/UpdateCompanyRole/index.tsx
index 9aaa0f4a0..7809264d4 100644
--- a/src/components/overlays/UpdateCompanyRole/index.tsx
+++ b/src/components/overlays/UpdateCompanyRole/index.tsx
@@ -53,6 +53,7 @@ import {
   setOverlayCancel,
 } from 'features/companyRoles/slice'
 import { useFetchFrameDocumentByIdMutation } from 'features/appManagement/apiSlice'
+import uniq from 'lodash.uniq'
 
 export enum AgreementStatus {
   ACTIVE = 'ACTIVE',
@@ -90,9 +91,14 @@ export default function UpdateCompanyRole({ roles }: { roles: string[] }) {
   const newRolesSummary = [...newSelectedRoles, ...newDeselectedRoles]
 
   useEffect(() => {
+    const handleAgreement = (agreement: AgreementsData) => {
+      setAgreements((oldArray: AgreementsData[]) =>
+        uniq([...oldArray, agreement])
+      )
+    }
     newSelectedRoles?.map((role: CompanyRolesResponse) =>
       role.agreements.map((agreement: AgreementsData) => {
-        setAgreements((oldArray: AgreementsData[]) => [...oldArray, agreement])
+        handleAgreement(agreement)
         return null
       })
     )
@@ -393,10 +399,16 @@ export default function UpdateCompanyRole({ roles }: { roles: string[] }) {
                               'content.companyRolesUpdate.overlay.TermsAndCondSpan2'
                             )}
                           </Typography>
+                          <span style={{ color: 'red' }}>
+                            {agreement.mandatory ? ' *' : ''}
+                          </span>
                         </>
                       ) : (
                         <Typography variant="label2">
                           {agreement.agreementName}
+                          <span style={{ color: 'red' }}>
+                            {agreement.mandatory ? ' *' : ''}
+                          </span>
                         </Typography>
                       )}
                     </li>
@@ -431,7 +443,15 @@ export default function UpdateCompanyRole({ roles }: { roles: string[] }) {
             variant="contained"
             onClick={() => handleSubmit()}
             disabled={
-              checkedAgreementsIds.length === agreements?.length ? false : true
+              !(
+                checkedAgreementsIds.length >=
+                  agreements.filter((agreement) => agreement.mandatory)
+                    .length &&
+                agreements
+                  .filter((item) => item.mandatory)
+                  .map((i) => i.agreementId)
+                  .every((value) => checkedAgreementsIds.includes(value))
+              )
             }
           >
             {`${t('content.companyRolesUpdate.overlay.submit')}`}
diff --git a/src/components/pages/AdminCredential/AdminCredential.scss b/src/components/pages/AdminCredential/AdminCredential.scss
index 6203652e2..045d5c564 100644
--- a/src/components/pages/AdminCredential/AdminCredential.scss
+++ b/src/components/pages/AdminCredential/AdminCredential.scss
@@ -52,6 +52,12 @@
     transform: translateX(-50%);
   }
 
+  .recommended-main {
+    .MuiDataGrid-cell {
+      font-size: 14px;
+    }
+  }
+
   .documenticon-main {
     position: relative;
     display: flex;
diff --git a/src/components/pages/AdminCredential/AdminCredentialElements.tsx b/src/components/pages/AdminCredential/AdminCredentialElements.tsx
index 6b13a2774..0ca5926ed 100644
--- a/src/components/pages/AdminCredential/AdminCredentialElements.tsx
+++ b/src/components/pages/AdminCredential/AdminCredentialElements.tsx
@@ -223,6 +223,28 @@ export default function AdminCredentialElements() {
           </Button>
         </div>
       )
+    } else if (
+      UserService.hasRole(ROLES.REVOKE_CREDENTIALS_ISSUER) &&
+      row.participantStatus === StatusEnum.ACTIVE
+    ) {
+      return (
+        <Tooltips
+          additionalStyles={{
+            cursor: 'pointer',
+          }}
+          tooltipPlacement="top-start"
+          tooltipText={t('content.adminCertificate.table.revoke')}
+          children={
+            <SettingsBackupRestoreIcon
+              className="revokeBtn"
+              onClick={() => {
+                setOpenRevokeOverlay(true)
+                setCredentialData(row)
+              }}
+            />
+          }
+        />
+      )
     }
   }
 
@@ -275,7 +297,7 @@ export default function AdminCredentialElements() {
     },
     {
       field: 'credentialDetailId',
-      headerName: '',
+      headerName: t('content.adminCertificate.table.status'),
       flex: 2,
       renderCell: ({ row }: { row: CredentialData }) => (
         <StatusTag
@@ -292,39 +314,11 @@ export default function AdminCredentialElements() {
     },
     {
       field: 'approveDecline',
-      headerName: '',
-      flex: 2,
+      headerName: t('content.adminCertificate.table.action'),
+      flex: 2.5,
       renderCell: ({ row }: { row: CredentialData }) =>
         renderApproveDeclineBtn(row),
     },
-    {
-      field: '',
-      headerName: '',
-      flex: 1,
-      renderCell: ({ row }: { row: CredentialData }) => (
-        <>
-          {UserService.hasRole(ROLES.REVOKE_CREDENTIALS_ISSUER) &&
-            row.participantStatus === StatusEnum.ACTIVE && (
-              <Tooltips
-                additionalStyles={{
-                  cursor: 'pointer',
-                }}
-                tooltipPlacement="top-start"
-                tooltipText={t('content.adminCertificate.table.revoke')}
-                children={
-                  <SettingsBackupRestoreIcon
-                    className="revokeBtn"
-                    onClick={() => {
-                      setOpenRevokeOverlay(true)
-                      setCredentialData(row)
-                    }}
-                  />
-                }
-              />
-            )}
-        </>
-      ),
-    },
   ]
 
   const handleRevokeConfirm = async (credentialId: string) => {
@@ -430,6 +424,7 @@ export default function AdminCredentialElements() {
           onSortClick={(value) => {
             setSortOption(value)
           }}
+          disableColumnSelector={true}
         />
       </div>
     </>
diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
index 6479cae94..525262a2a 100644
--- a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
+++ b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
@@ -120,7 +120,7 @@ const ConnectorDetailsOverlay = ({
           t('content.edcconnector.details.noTechnicalUserAvailable')
         ) : (
           <a
-            href={`/techUserDetails/${fetchConnectorDetails?.technicalUser?.id}`}
+            href={`/techuserdetails/${fetchConnectorDetails?.technicalUser?.id}`}
           >
             {fetchConnectorDetails?.technicalUser?.name}
           </a>
diff --git a/src/components/pages/IDPManagement/IDPList.tsx b/src/components/pages/IDPManagement/IDPList.tsx
index a5ade9593..567b2051a 100644
--- a/src/components/pages/IDPManagement/IDPList.tsx
+++ b/src/components/pages/IDPManagement/IDPList.tsx
@@ -199,13 +199,6 @@ export const IDPList = () => {
           label={ti('action.register_next')}
         />
       ),
-      consent: (
-        <MenuItemOpenOverlay
-          overlay={OVERLAYS.CONSENT_OSP}
-          id={idp.identityProviderId}
-          label={ti('action.consent')}
-        />
-      ),
       enableToggle:
         isManaged && idp.enabled ? (
           <MenuItemOpenOverlay
diff --git a/src/features/companyRoles/companyRoleApiSlice.ts b/src/features/companyRoles/companyRoleApiSlice.ts
index dd2b902ad..2fcad1bf3 100644
--- a/src/features/companyRoles/companyRoleApiSlice.ts
+++ b/src/features/companyRoles/companyRoleApiSlice.ts
@@ -26,6 +26,7 @@ export type AgreementsData = {
   agreementName: string
   consentStatus: string
   documentId: string
+  mandatory?: boolean
 }
 
 export type CompanyRolesResponse = {
diff --git a/src/services/AccessService.tsx b/src/services/AccessService.tsx
index 7fb032325..50bbd0967 100644
--- a/src/services/AccessService.tsx
+++ b/src/services/AccessService.tsx
@@ -65,7 +65,6 @@ import EditUsecase from 'components/overlays/EditUsecase'
 import UpdateCertificate from 'components/overlays/UpdateCertificate'
 import AddMultipleUser from 'components/overlays/AddMultipleUser'
 import { OSPRegister } from 'components/overlays/OSPRegister'
-import { OSPConsent } from 'components/overlays/OSPConsent'
 import { OSPRegisterNext } from 'components/overlays/OSPRegister/OSPRegisterNext'
 import CompanyCertificateDetails from 'components/overlays/CompanyCertificateDetails'
 import DeleteCompanyCertificateConfirmationOverlay from 'components/overlays/CompanyCertificateDetails/DeleteCompanyCertificateConfirmationOverlay'
@@ -175,8 +174,6 @@ export const getOverlay = (overlay: OverlayState) => {
       return <OSPRegister id={overlay.id} />
     case OVERLAYS.REGISTER_NEXT_OSP:
       return <OSPRegisterNext id={overlay.id} />
-    case OVERLAYS.CONSENT_OSP:
-      return <OSPConsent />
     case OVERLAYS.APP_OVERVIEW_CONFIRM:
       return <AppOverViewConfirm id={overlay.id} title={overlay.title} />
     case OVERLAYS.APP_DETAILS_OVERLAY: