diff --git a/src/components/auth/auth_initializer/AuthInitializer.jsx b/src/components/auth/auth_initializer/AuthInitializer.jsx
index e1770633..0bb5e445 100644
--- a/src/components/auth/auth_initializer/AuthInitializer.jsx
+++ b/src/components/auth/auth_initializer/AuthInitializer.jsx
@@ -2,13 +2,18 @@ import { AuthProviderFactory } from "@logora/debate/auth/providers";
 import { authTokenHandler, useAuthActions } from "@logora/debate/auth/use_auth";
 import { useAuthInterceptor } from "@logora/debate/auth/use_auth";
 import { httpClient } from "@logora/debate/data/axios_client";
+import { useConfig } from "@logora/debate/data/config_provider";
+import { UpdateUserInfoModal } from "@logora/debate/user/update_user_info_modal";
 import { useAuthRequired } from "@logora/debate/hooks/use_auth_required";
-import { useEffect } from "react";
+import React, { useState, useEffect } from "react";
 
 export const AuthInitializer = ({ authUrl, authType, provider, assertion }) => {
 	const tokenKey = "logora_user_token";
+	const config = useConfig();
 	useAuthInterceptor(httpClient, authUrl, tokenKey);
 
+	const [pendingAuth, setPendingAuth] = useState(null);
+
 	const { getToken, removeToken } = authTokenHandler(
 		httpClient,
 		authUrl,
@@ -60,16 +65,44 @@ export const AuthInitializer = ({ authUrl, authType, provider, assertion }) => {
 		if (authProvider.shouldInitAuth()) {
 			const authParams = authProvider.getAuthorizationParams();
 			if (authParams) {
-				loginUser(authParams);
+				if (config.auth?.hideCgu !== true) {
+					setPendingAuth(authParams);
+				} else {
+					loginUser(authParams);
+				}
 			}
 		} else {
 			logoutUser();
 		}
 	};
 
+	const handleConsentConfirmed = (consentedAuthParams) => {
+		loginUser(consentedAuthParams);
+		setPendingAuth(null);
+	};
+
 	const getAuthProvider = () => {
 		return AuthProviderFactory.create(authType, provider, assertion);
 	};
 
-	return null;
+	return (
+		<>
+			{pendingAuth && (
+				<UpdateUserInfoModal
+					pendingAuth={pendingAuth}
+					onConsentConfirmed={handleConsentConfirmed}
+					showTerms={true}
+					showEmailConsent={config.auth?.showEmailConsent}
+					termsUrl={
+						config.provider?.cguUrl ||
+						"https://www.logora.com/blog-posts/cgu"
+					}
+					privacyUrl={
+						config.provider?.privacyUrl ||
+						"https://www.logora.com/blog-posts/privacy-policy"
+					}
+				/>
+			)}
+		</>
+	);
 };
diff --git a/src/components/auth/social_auth_form/SocialAuthForm.jsx b/src/components/auth/social_auth_form/SocialAuthForm.jsx
index 77431d8b..edccbb12 100644
--- a/src/components/auth/social_auth_form/SocialAuthForm.jsx
+++ b/src/components/auth/social_auth_form/SocialAuthForm.jsx
@@ -2,10 +2,8 @@ import { FacebookLoginButton } from "@logora/debate/auth/facebook_login_button";
 import { GoogleLoginButton } from "@logora/debate/auth/google_login_button";
 import { LoginForm } from "@logora/debate/auth/login_form";
 import { SignupForm } from "@logora/debate/auth/signup_form";
-import { EMAIL_CONSENT_STORAGE_KEY } from "@logora/debate/auth/use_auth";
 import { Icon } from "@logora/debate/icons/icon";
 import { Toggle } from "@logora/debate/input/toggle";
-import useSessionStorageState from "@rooks/use-sessionstorage-state";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import styles from "./SocialAuthForm.module.scss";
@@ -27,10 +25,7 @@ export const SocialAuthForm = ({
 		!(lastStep === "LOGIN" || lastStep === "SIGNUP"),
 	);
 	const [loginStep, setLoginStep] = useState(lastStep !== "SIGNUP");
-	const [emailConsent, setEmailConsent] = useSessionStorageState(
-		EMAIL_CONSENT_STORAGE_KEY,
-		false,
-	);
+	const [emailConsent, setEmailConsent] = useState(false);
 	const intl = useIntl();
 
 	const handleSignUp = (
diff --git a/src/components/auth/use_auth/useAuthActions.js b/src/components/auth/use_auth/useAuthActions.js
index b1ce9f8b..cffa5cdd 100644
--- a/src/components/auth/use_auth/useAuthActions.js
+++ b/src/components/auth/use_auth/useAuthActions.js
@@ -34,6 +34,7 @@ export const useAuthActions = (httpClient, authUrl, tokenKey) => {
 		setIsLoggingIn(false);
 		setCurrentUser({});
 		removeToken();
+		sessionStorage.removeItem(EMAIL_CONSENT_STORAGE_KEY);
 		dispatchLogoutEvent();
 	};
 
diff --git a/src/components/user/update_user_info_modal/UpdateUserInfoModal.jsx b/src/components/user/update_user_info_modal/UpdateUserInfoModal.jsx
index cec6176b..f4c7578e 100644
--- a/src/components/user/update_user_info_modal/UpdateUserInfoModal.jsx
+++ b/src/components/user/update_user_info_modal/UpdateUserInfoModal.jsx
@@ -20,6 +20,8 @@ export const UpdateUserInfoModal = ({
 	privacyUrl,
 	showEmailConsent = false,
 	showTerms = false,
+	pendingAuth = null,
+	onConsentConfirmed = null,
 }) => {
 	const auth = useAuth();
 	const api = useDataProvider();
@@ -63,7 +65,7 @@ export const UpdateUserInfoModal = ({
 		{ first_name: ["minChar", 2] },
 		{ last_name: ["required", null] },
 		{ last_name: ["minChar", 2] },
-		{ language: ["required", null] },
+		...(pendingAuth ? [] : [{ language: ["required", null] }]),
 		...(showTerms ? [{ accepts_terms: ["enforceValue", true] }] : []),
 	];
 
@@ -98,19 +100,31 @@ export const UpdateUserInfoModal = ({
 
 		if (validate(data, validationRules)) {
 			setIsUpdating(true);
-			const formData = new FormData();
-			Object.entries(data).forEach(([key, value]) => {
-				formData.append(key, value);
-			});
 
-			api.update("users", auth.currentUser.slug, formData).then((response) => {
-				if (response.data.success) {
-					auth.setCurrentUser(response.data.data.resource);
-					hideModal();
-				} else {
-					hideModal();
-				}
-			});
+			if (pendingAuth && onConsentConfirmed) {
+				const finalAuthParams = {
+					...pendingAuth,
+					first_name: firstName,
+					last_name: lastName,
+					accepts_terms: acceptsTerms,
+					accepts_provider_email: showEmailConsent ? acceptsProviderEmail : false,
+				};
+				onConsentConfirmed(finalAuthParams);
+			} else {
+				const formData = new FormData();
+				Object.entries(data).forEach(([key, value]) => {
+					formData.append(key, value);
+				});
+
+				api.update("users", auth.currentUser.slug, formData).then((response) => {
+					if (response.data.success) {
+						auth.setCurrentUser(response.data.data.resource);
+						hideModal();
+					} else {
+						hideModal();
+					}
+				});
+			}
 		}
 	};
 
@@ -130,10 +144,17 @@ export const UpdateUserInfoModal = ({
 	return (
 		<Modal
 			data-vid={"update_user_info_modal"}
-			title={intl.formatMessage({
-				id: "modal.update_user_info_modal.modal_title",
-				defaultMessage: "Update your profile",
-			})}
+			title={
+				pendingAuth
+					? intl.formatMessage({
+							id: "modal.update_user_info_modal.complete_registration",
+							defaultMessage: "Complete your registration",
+						})
+					: intl.formatMessage({
+							id: "modal.update_user_info_modal.modal_title",
+							defaultMessage: "Update your profile",
+						})
+			}
 			style={{
 				width: isMobile ? "unset" : "max-content",
 				minWidth: isMobile ? "unset" : "500px",
@@ -144,139 +165,159 @@ export const UpdateUserInfoModal = ({
 		>
 			{isUpdating ? (
 				<Loader />
-			) : !showAvatars ? (
+			) : showAvatars && !pendingAuth ? (
 				<>
-					<div className={styles.container}>
-						<div className={styles.userImageContainer}>
-							{previewPictureBase64 ? (
-								<img
-									className={styles.userPictureUpload}
-									src={previewPictureBase64}
-									alt={intl.formatMessage({
-										id: "alt.my_profile_picture",
-										defaultMessage: "Ma photo de profil",
-									})}
-								/>
-							) : (
-								<div className={styles.userPictureUpload}>
-									<Icon
-										name="camera"
-										height={20}
-										width={20}
+					<AvatarSelector
+						onChooseAvatar={handleChooseAvatar}
+						avatarUrlList={avatarUrlList}
+						userName={auth.currentUser.full_name}
+						allowUserImage={config.avatars?.allowUserImage}
+					/>
+					<div
+						className={styles.backButton}
+						onClick={() => setShowAvatars(false)}
+					>
+						{intl.formatMessage({
+							id: "user.user_edit.back",
+							defaultMessage: "Back",
+						})}
+					</div>
+				</>
+			) : (
+				<>
+					{!pendingAuth && (
+						<div className={styles.container}>
+							<div className={styles.userImageContainer}>
+								{previewPictureBase64 ? (
+									<img
+										className={styles.userPictureUpload}
+										src={previewPictureBase64}
 										alt={intl.formatMessage({
-											id: "user.user_edit.profile_picture",
-											defaultMessage: "Profile picture",
+											id: "alt.my_profile_picture",
+											defaultMessage: "Ma photo de profil",
 										})}
 									/>
+								) : (
+									<div className={styles.userPictureUpload}>
+										<Icon
+											name="camera"
+											height={20}
+											width={20}
+											alt={intl.formatMessage({
+												id: "user.user_edit.profile_picture",
+												defaultMessage: "Profile picture",
+											})}
+										/>
+									</div>
+								)}
+								<Button
+									data-testid="avatar-button"
+									data-tid={"action_save_profile"}
+									onClick={() => setShowAvatars(true)}
+									style={{ whiteSpace: "nowrap" }}
+								>
+									{intl.formatMessage({
+										id: "user.user_edit.avatar",
+										defaultMessage: "Select an avatar",
+									})}
+								</Button>
+							</div>
+							<div className={styles.inputsContainer}>
+								<div className={styles.nameContainer}>
+									<div className={styles.updateProfileInput}>
+										<TextInput
+											type={"text"}
+											name={"first_name"}
+											aria-label={intl.formatMessage({
+												id: "auth.signup_form.first_name.aria_label",
+												defaultMessage: "First name",
+											})}
+											placeholder={intl.formatMessage({
+												id: "auth_signup_form_first_name_placeholder",
+												defaultMessage: "First name",
+											})}
+											onChange={(e) =>
+												config.actions?.disableOnboardingNameUpdate === true
+													? null
+													: setFirstName(e.target.value)
+											}
+											value={firstName}
+											error={errors["first_name"] ? true : false}
+											message={errors["first_name"]}
+											data-testid="first-name"
+											disabled={
+												config.actions?.disableOnboardingNameUpdate === true
+											}
+										/>
+									</div>
+									<div className={styles.updateProfileInput}>
+										<TextInput
+											type={"text"}
+											name={"last_name"}
+											aria-label={intl.formatMessage({
+												id: "auth.signup_form.last_name.aria_label",
+												defaultMessage: "Last name",
+											})}
+											placeholder={intl.formatMessage({
+												id: "auth_signup_form_last_name_placeholder",
+												defaultMessage: "Last name",
+											})}
+											onChange={(e) =>
+												config.actions?.disableOnboardingNameUpdate === true
+													? null
+													: setLastName(e.target.value)
+											}
+											value={lastName}
+											error={errors["last_name"] ? true : false}
+											message={errors["last_name"]}
+											data-testid="last-name"
+											disabled={
+												config.actions?.disableOnboardingNameUpdate === true
+											}
+										/>
+									</div>
 								</div>
-							)}
-							<Button
-								data-testid="avatar-button"
-								data-tid={"action_save_profile"}
-								onClick={() => setShowAvatars(true)}
-								style={{ whiteSpace: "nowrap" }}
-							>
-								{intl.formatMessage({
-									id: "user.user_edit.avatar",
-									defaultMessage: "Select an avatar",
-								})}
-							</Button>
-						</div>
-						<div className={styles.inputsContainer}>
-							<div className={styles.nameContainer}>
-								<div className={styles.updateProfileInput}>
-									<TextInput
-										type={"text"}
-										name={"first_name"}
-										aria-label={intl.formatMessage({
-											id: "auth.signup_form.first_name.aria_label",
-											defaultMessage: "First name",
-										})}
-										placeholder={intl.formatMessage({
-											id: "auth_signup_form_first_name_placeholder",
-											defaultMessage: "First name",
-										})}
-										onChange={(e) =>
-											config.actions?.disableOnboardingNameUpdate === true
-												? null
-												: setFirstName(e.target.value)
-										}
-										value={firstName}
-										error={errors["first_name"] ? true : false}
-										message={errors["first_name"]}
-										data-testid="first-name"
-										disabled={
-											config.actions?.disableOnboardingNameUpdate === true
-										}
-									/>
-								</div>
-								<div className={styles.updateProfileInput}>
-									<TextInput
-										type={"text"}
-										name={"last_name"}
-										aria-label={intl.formatMessage({
-											id: "auth.signup_form.last_name.aria_label",
-											defaultMessage: "Last name",
-										})}
+								{config.actions?.disableNameUpdate == true &&
+									config.actions?.disableOnboardingNameUpdate != true && (
+										<div className={styles.hint}>
+											{intl.formatMessage({
+												id: "user.user_edit.user_name_hint",
+												defaultMessage: "last name",
+											})}
+										</div>
+									)}
+								{config.translation?.translationMethods &&
+									Object.keys(config.translation.translationMethods).length >
+										0 && (
+										<Select
+											selectClassName={styles.langSelect}
+											options={Object.keys(
+												config.translation.translationMethods,
+											).map((l) => ({
+												name: l,
+												value: l,
+												text: `${l.toUpperCase()}`,
+											}))}
+											defaultOption={lang}
+											onChange={(option) => setLang(option.value)}
+										/>
+									)}
+								<div className={styles.userDescription}>
+									<textarea
+										className={styles.textArea}
 										placeholder={intl.formatMessage({
-											id: "auth_signup_form_last_name_placeholder",
-											defaultMessage: "Last name",
+											id: "user.user_edit.user_description",
+											defaultMessage: "Describe yourself in a few words",
 										})}
-										onChange={(e) =>
-											config.actions?.disableOnboardingNameUpdate === true
-												? null
-												: setLastName(e.target.value)
-										}
-										value={lastName}
-										error={errors["last_name"] ? true : false}
-										message={errors["last_name"]}
-										data-testid="last-name"
-										disabled={
-											config.actions?.disableOnboardingNameUpdate === true
-										}
+										value={description}
+										onChange={(e) => setDescription(e.target.value)}
+										maxLength={500}
+										data-testid="description"
 									/>
 								</div>
 							</div>
-							{config.actions?.disableNameUpdate == true &&
-								config.actions?.disableOnboardingNameUpdate != true && (
-									<div className={styles.hint}>
-										{intl.formatMessage({
-											id: "user.user_edit.user_name_hint",
-											defaultMessage: "last name",
-										})}
-									</div>
-								)}
-							{config.translation?.translationMethods &&
-								Object.keys(config.translation.translationMethods).length >
-									0 && (
-									<Select
-										selectClassName={styles.langSelect}
-										options={Object.keys(
-											config.translation.translationMethods,
-										).map((l) => ({
-											name: l,
-											value: l,
-											text: `${l.toUpperCase()}`,
-										}))}
-										defaultOption={lang}
-										onChange={(option) => setLang(option.value)}
-									/>
-								)}
-							<div className={styles.userDescription}>
-								<textarea
-									className={styles.textArea}
-									placeholder={intl.formatMessage({
-										id: "user.user_edit.user_description",
-										defaultMessage: "Describe yourself in a few words",
-									})}
-									value={description}
-									onChange={(e) => setDescription(e.target.value)}
-									maxLength={500}
-									data-testid="description"
-								/>
-							</div>
 						</div>
-					</div>
+					)}
 					{showTerms && (
 						<div className={styles.toggle}>
 							<Toggle
@@ -352,25 +393,7 @@ export const UpdateUserInfoModal = ({
 						</Button>
 					</div>
 				</>
-			) : (
-				<>
-					<AvatarSelector
-						onChooseAvatar={handleChooseAvatar}
-						avatarUrlList={avatarUrlList}
-						userName={auth.currentUser.full_name}
-						allowUserImage={config.avatars?.allowUserImage}
-					/>
-					<div
-						className={styles.backButton}
-						onClick={() => setShowAvatars(false)}
-					>
-						{intl.formatMessage({
-							id: "user.user_edit.back",
-							defaultMessage: "Back",
-						})}
-					</div>
-				</>
 			)}
 		</Modal>
 	);
-};
+};
\ No newline at end of file