diff --git a/CHANGELOG.md b/CHANGELOG.md
index 902c3eb60..a9a837e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## next deploy
 
+- Fix a bug: Gender, Address and Birthday are not mapped properly from SSO (#365)
+
 ## v5.4.10 2022 July 05
 
 - Increased About page title's size
diff --git a/app/frontend/src/javascript/components/authentication-provider/type-mapping-modal.tsx b/app/frontend/src/javascript/components/authentication-provider/type-mapping-modal.tsx
index 6b3e19d76..e2fc0539a 100644
--- a/app/frontend/src/javascript/components/authentication-provider/type-mapping-modal.tsx
+++ b/app/frontend/src/javascript/components/authentication-provider/type-mapping-modal.tsx
@@ -9,6 +9,7 @@ import { mappingType } from '../../models/authentication-provider';
 import { BooleanMappingForm } from './boolean-mapping-form';
 import { DateMappingForm } from './date-mapping-form';
 import { StringMappingForm } from './string-mapping-form';
+import { FormInput } from '../form/form-input';
 
 interface TypeMappingModalProps<TFieldValues, TContext extends object> {
   model: string,
@@ -38,6 +39,10 @@ export const TypeMappingModal = <TFieldValues extends FieldValues, TContext exte
               confirmButton={<i className="fa fa-check" />}
               onConfirm={toggleModal}>
       <span>{model} &gt; {field} ({t('app.admin.authentication.type_mapping_modal.TYPE_expected', { TYPE: t(`app.admin.authentication.type_mapping_modal.types.${type}`) })})</span>
+      <FormInput register={register}
+                 id={`auth_provider_mappings_attributes.${fieldMappingId}.transformation.type`}
+                 type="hidden"
+                 defaultValue={type} />
       {type === 'integer' && <IntegerMappingForm register={register} control={control} fieldMappingId={fieldMappingId} />}
       {type === 'boolean' && <BooleanMappingForm register={register} fieldMappingId={fieldMappingId} />}
       {type === 'date' && <DateMappingForm control={control} fieldMappingId={fieldMappingId} />}
diff --git a/app/frontend/src/javascript/models/authentication-provider.ts b/app/frontend/src/javascript/models/authentication-provider.ts
index 40ed22c4a..6cfebd092 100644
--- a/app/frontend/src/javascript/models/authentication-provider.ts
+++ b/app/frontend/src/javascript/models/authentication-provider.ts
@@ -25,10 +25,12 @@ export interface AuthenticationProviderMapping {
     format: 'iso8601' | 'rfc2822' | 'rfc3339' | 'timestamp-s' | 'timestamp-ms',
     true_value: string,
     false_value: string,
-    mapping: {
-      from: string,
-      to: number|string
-    }
+    mapping: [
+      {
+        from: string,
+        to: number|string
+      }
+    ]
   }
 }