diff --git a/cypress/e2e/SignUp.cy.ts b/cypress/e2e/SignUp.cy.ts
index 5aa1bbfea..f38897319 100644
--- a/cypress/e2e/SignUp.cy.ts
+++ b/cypress/e2e/SignUp.cy.ts
@@ -15,7 +15,6 @@ describe('SignUp', () => {
   describe('Must Accept All Terms To Sign Up', () => {
     beforeEach(() => {
       cy.visit(SIGN_UP_PATH);
-      // eslint-disable-next-line arrow-body-style
       cy.intercept({ method: 'post', pathname: '/register' }, ({ reply }) => {
         return reply({
           statusCode: StatusCodes.NO_CONTENT,
@@ -36,8 +35,6 @@ describe('SignUp', () => {
     it('Sign Up', () => {
       const { GRAASP, WRONG_NAME, WRONG_EMAIL } = MEMBERS;
       cy.visit(SIGN_UP_PATH);
-
-      // eslint-disable-next-line arrow-body-style
       cy.intercept({ method: 'post', pathname: '/register' }, ({ reply }) => {
         return reply({
           statusCode: StatusCodes.NO_CONTENT,
@@ -108,7 +105,6 @@ describe('SignUp', () => {
 
     beforeEach(() => {
       cy.visit(SIGN_UP_PATH);
-      // eslint-disable-next-line arrow-body-style
       cy.intercept({ method: 'post', pathname: '/register' }, ({ reply }) => {
         return reply({
           statusCode: StatusCodes.NO_CONTENT,
diff --git a/package.json b/package.json
index 86669028c..d514aef50 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "@emotion/cache": "11.11.0",
     "@emotion/react": "11.11.4",
     "@emotion/styled": "11.11.0",
-    "@graasp/query-client": "github:graasp/graasp-query-client#717-add-enable-save-actions-on-member-sign-up-and-update",
-    "@graasp/sdk": "github:graasp/graasp-sdk#467-includes-save-actions-and-user-agreements-in-complete-member",
+    "@graasp/query-client": "3.4.0",
+    "@graasp/sdk": "4.7.0",
     "@graasp/translations": "1.25.3",
     "@graasp/ui": "4.11.0",
     "@mui/icons-material": "5.15.14",
diff --git a/src/components/AgreementForm.tsx b/src/components/AgreementForm.tsx
index 194a68f13..420aeab91 100644
--- a/src/components/AgreementForm.tsx
+++ b/src/components/AgreementForm.tsx
@@ -7,6 +7,7 @@ import {
   Typography,
 } from '@mui/material';
 
+import { MAX_CHECKBOX_LABEL_WITH_PX_SIGN_UP } from '../config/constants';
 import { useAuthTranslation } from '../config/i18n';
 import { SIGN_UP_AGREEMENTS_CHECKBOX_ID } from '../config/selectors';
 import { UseAgreementForm } from '../hooks/useAgreementForm';
@@ -29,7 +30,7 @@ export const AgreementForm = ({ useAgreementForm }: Props) => {
   const errorColor = 'error';
 
   return (
-    <FormGroup sx={{ maxWidth: '330px' }}>
+    <FormGroup sx={{ maxWidth: `${MAX_CHECKBOX_LABEL_WITH_PX_SIGN_UP}px` }}>
       <FormControlLabel
         checked={userHasAcceptedAllTerms}
         onChange={(_, checked) => updateUserAgreements(checked)}
diff --git a/src/components/EnableAnalyticsForm.tsx b/src/components/EnableAnalyticsForm.tsx
index 06415984b..ca1f7a9dd 100644
--- a/src/components/EnableAnalyticsForm.tsx
+++ b/src/components/EnableAnalyticsForm.tsx
@@ -6,30 +6,33 @@ import {
   Typography,
 } from '@mui/material';
 
+import { MAX_CHECKBOX_LABEL_WITH_PX_SIGN_UP } from '../config/constants';
 import { useAuthTranslation } from '../config/i18n';
 import { SIGN_UP_SAVE_ACTIONS_ID } from '../config/selectors';
-import { UseEnableAnalyticsForm } from '../hooks/useEnableAnalyticsForm';
 import { AUTH } from '../langs/constants';
 
 type Props = {
-  useEnableAnalyticsForm: UseEnableAnalyticsForm;
+  enableSaveActions: boolean;
+  onUpdateSaveActions: (enabled: boolean) => void;
 };
 
-export const EnableAnalyticsForm = ({ useEnableAnalyticsForm }: Props) => {
+export const EnableAnalyticsForm = ({
+  enableSaveActions,
+  onUpdateSaveActions,
+}: Props) => {
   const { SIGN_UP_SAVE_ACTIONS_TOOLTIP, SIGN_UP_SAVE_ACTIONS_LABEL } = AUTH;
   const { t } = useAuthTranslation();
-  const { enableSaveActions, updateSaveActions } = useEnableAnalyticsForm;
 
   return (
     <Tooltip title={t(SIGN_UP_SAVE_ACTIONS_TOOLTIP)} placement="right">
-      <FormGroup sx={{ maxWidth: 'max-content' }}>
+      <FormGroup sx={{ maxWidth: `${MAX_CHECKBOX_LABEL_WITH_PX_SIGN_UP}px` }}>
         <FormControlLabel
           control={
             <Checkbox
               id={SIGN_UP_SAVE_ACTIONS_ID}
               size="small"
               checked={enableSaveActions}
-              onChange={(_, checked) => updateSaveActions(checked)}
+              onChange={(_, checked) => onUpdateSaveActions(checked)}
             />
           }
           label={
diff --git a/src/components/SignUp.tsx b/src/components/SignUp.tsx
index 4c17f2f09..51db25ae1 100644
--- a/src/components/SignUp.tsx
+++ b/src/components/SignUp.tsx
@@ -21,7 +21,6 @@ import { useRecaptcha } from '../context/RecaptchaContext';
 import { useMobileAppLogin } from '../hooks/mobile';
 import { useRedirection } from '../hooks/searchParams';
 import { useAgreementForm } from '../hooks/useAgreementForm';
-import { useEnableAnalyticsForm } from '../hooks/useEnableAnalyticsForm';
 import { AUTH } from '../langs/constants';
 import { emailValidator, nameValidator } from '../utils/validation';
 import { AgreementForm } from './AgreementForm';
@@ -48,9 +47,7 @@ const SignUp = () => {
   const [successView, setSuccessView] = useState(false);
   // enable validation after first click
   const [shouldValidate, setShouldValidate] = useState(false);
-
-  const enableAnalyticsFormHook = useEnableAnalyticsForm();
-  const { enableSaveActions } = enableAnalyticsFormHook;
+  const [enableSaveActions, setEnableSaveActions] = useState<boolean>(true);
 
   const agreementFormHook = useAgreementForm();
   const { verifyUserAgreements, userHasAcceptedAllTerms } = agreementFormHook;
@@ -151,7 +148,8 @@ const SignUp = () => {
             shouldValidate={shouldValidate}
           />
           <EnableAnalyticsForm
-            useEnableAnalyticsForm={enableAnalyticsFormHook}
+            enableSaveActions={enableSaveActions}
+            onUpdateSaveActions={(enabled) => setEnableSaveActions(enabled)}
           />
           <AgreementForm useAgreementForm={agreementFormHook} />
           <Button
diff --git a/src/config/constants.ts b/src/config/constants.ts
index c37028866..4beeda937 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -14,3 +14,5 @@ export const AVATAR_ICON_HEIGHT = 30;
 
 export const MEMBER_PROFILE_PATH = `${GRAASP_BUILDER_HOST}/profile`;
 export const SIGN_IN_PATH = buildSignInPath({ host: AUTHENTICATION_HOST });
+
+export const MAX_CHECKBOX_LABEL_WITH_PX_SIGN_UP = 330;
diff --git a/src/hooks/useEnableAnalyticsForm.tsx b/src/hooks/useEnableAnalyticsForm.tsx
deleted file mode 100644
index 339b43ac4..000000000
--- a/src/hooks/useEnableAnalyticsForm.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useState } from 'react';
-
-export type UseEnableAnalyticsForm = {
-  enableSaveActions: boolean;
-  updateSaveActions: (enable: boolean) => void;
-};
-
-export const useEnableAnalyticsForm = (): UseEnableAnalyticsForm => {
-  const [enableSaveActions, setEnableSaveActions] = useState<boolean>(true);
-
-  const updateSaveActions = (enable: boolean) => {
-    setEnableSaveActions(enable);
-  };
-
-  return {
-    enableSaveActions,
-    updateSaveActions,
-  };
-};
diff --git a/src/langs/en.json b/src/langs/en.json
index 49564ac9f..6d6e6e7b4 100644
--- a/src/langs/en.json
+++ b/src/langs/en.json
@@ -20,8 +20,8 @@
   "SIGN_UP_BUTTON": "Sign Up",
   "SIGN_UP_HEADER": "Sign Up",
   "SIGN_UP_LINK_TEXT": "Not registered? Click here to register",
-  "SIGN_UP_SAVE_ACTIONS_LABEL": "Enable Analytics",
-  "SIGN_UP_SAVE_ACTIONS_TOOLTIP": "We collect analytics data to improve your user experience while browsing Graasp.",
+  "SIGN_UP_SAVE_ACTIONS_LABEL": "Activate data-driven insights saving for enhanced analytics dashboards",
+  "SIGN_UP_SAVE_ACTIONS_TOOLTIP": "We collect analytic data to improve your user experience while browsing Graasp.",
   "SIGN_UP_SUCCESS_TITLE": "Welcome!",
   "SWITCH_ACCOUNT_TEXT": "Switch to another account",
   "API_UNAVAILABLE_TITLE": "Server Connection Error",
diff --git a/src/langs/fr.json b/src/langs/fr.json
index 11e6bb450..ac7027623 100644
--- a/src/langs/fr.json
+++ b/src/langs/fr.json
@@ -21,7 +21,7 @@
   "SIGN_UP_HEADER": "S'enregistrer",
   "SIGN_UP_LINK_TEXT": "Pas encore enregistré ? Cliquez ici pour vous enregistrer",
   "SIGN_UP_SAVE_ACTIONS_LABEL": "Activer les statistiques d'utilisation",
-  "SIGN_UP_SAVE_ACTIONS_TOOLTIP": "Nous recueillons des données analytiques afin d'améliorer votre expérience d'utilisateur lorsque vous naviguez sur Graasp.",
+  "SIGN_UP_SAVE_ACTIONS_TOOLTIP": "Nous recueillons des données analytiques afin d'améliorer votre expérience utilisateur lorsque vous naviguez sur Graasp.",
   "SIGN_UP_SUCCESS_TITLE": "Bienvenue !",
   "SWITCH_ACCOUNT_TEXT": "Utiliser un autre compte",
   "USER_AGREEMENTS_TERMS_OF_SERVICE": "conditions d'utilisation",