diff --git a/src/domains/pay-wallet-app/api/fragments/_fragment_policy_user_id_from_session_token.tpl.xml b/src/domains/pay-wallet-app/api/fragments/_fragment_policy_user_id_from_session_token.tpl.xml
index 39eefad065..948eface1d 100644
--- a/src/domains/pay-wallet-app/api/fragments/_fragment_policy_user_id_from_session_token.tpl.xml
+++ b/src/domains/pay-wallet-app/api/fragments/_fragment_policy_user_id_from_session_token.tpl.xml
@@ -18,4 +18,4 @@
             return "user-id-not-found";
             }
     }" />
-</fragment>
\ No newline at end of file
+</fragment>
diff --git a/src/domains/shared-app/api/session-wallet/v1/_base_policy.xml.tpl b/src/domains/shared-app/api/session-wallet/v1/_base_policy.xml.tpl
index b6a30091e9..4e921a5de5 100644
--- a/src/domains/shared-app/api/session-wallet/v1/_base_policy.xml.tpl
+++ b/src/domains/shared-app/api/session-wallet/v1/_base_policy.xml.tpl
@@ -2,7 +2,7 @@
     <inbound>
       <base />
       <set-variable name="walletToken"  value="@(context.Request.Headers.GetValueOrDefault("Authorization", "").Replace("Bearer ",""))"  />
-      <!-- Perform PM start api call: for family&friends handling NPG flow must be activated only for 
+      <!-- Perform PM start api call: for family&friends handling NPG flow must be activated only for
         users that have been enabled in pay-wallet-family-friends-user-ids named value (list of user id = PDV fiscal code tokenization)
         For family&friends flow we expect that all clients will go with PM flow except the ones in the above list, that will be restricted
         to few selected users. Anticipating PM start session will prevent further api calls.
@@ -50,7 +50,7 @@
       <set-variable name="userFiscalCode" value="@{
           String userFiscalCode = ((JObject)context.Variables["pmSession"])?["data"]?["user"]?["fiscalCode"]?.ToString();
           return userFiscalCode;
-      }" 
+      }"
       />
       <choose>
           <when condition="@(String.IsNullOrEmpty((String)context.Variables["userFiscalCode"]))">
@@ -98,7 +98,7 @@
               </choose>
 
               <set-variable name="pdvToken" value="@(((IResponse)context.Variables["pdv-token"]).Body.As<JObject>())" />
-              <!-- used as jwt claims  https://auth0.com/docs/secure/tokens/json-web-tokens/json-web-token-claims -->      
+              <!-- used as jwt claims  https://auth0.com/docs/secure/tokens/json-web-tokens/json-web-token-claims -->
               <set-variable name="userId" value="@((string)((JObject)context.Variables["pdvToken"])["token"])" />
               <choose>
                 <when condition="@(String.IsNullOrEmpty((string)context.Variables["userId"]))">
@@ -128,9 +128,9 @@
           <!-- pagoPA platform wallet JWT session token : END -->
         </when>
         <otherwise>
-            <!-- Get User IO : START-->
+            <!-- Get User IO
             <send-request ignore-error="true" timeout="10" response-variable-name="user-auth-body" mode="new">
-              <set-url>@("${io_backend_base_path}/pagopa/api/v1/user?version=20200114")</set-url> 
+              <set-url>@("${io_backend_base_path}/pagopa/api/v1/user?version=20200114")</set-url>
               <set-method>GET</set-method>
               <set-header name="Accept" exists-action="override">
                 <value>application/json</value>
@@ -172,42 +172,42 @@
               </when>
             </choose>
             <set-variable name="userAuthBody" value="@(((IResponse)context.Variables["user-auth-body"]).Body.As<JObject>())" />
-            <!-- Get User IO : END-->
+            Get User IO : END-->
             <!-- pagoPA platform wallet JWT session token : START -->
             <!-- Token JWT START-->
                   <set-variable name="x-jwt-token" value="@{
                     //Construct the Base64Url-encoded header
                     var header = new { typ = "JWT", alg = "HS512" };
                     var jwtHeaderBase64UrlEncoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(header))).Replace("/", "_").Replace("+", "-"). Replace("=", "");
-                    
-                    // Construct the Base64Url-encoded payload 
+
+                    // Construct the Base64Url-encoded payload
                     var jti = Guid.NewGuid().ToString(); //sets the iat claim. Random uuid added to prevent the reuse of this token
                     var date = DateTime.Now;
                     var iat = new DateTimeOffset(date).ToUnixTimeSeconds(); // sets the issued time of the token now
                     var exp = new DateTimeOffset(date.AddMinutes(20)).ToUnixTimeSeconds();  // sets the expiration of the token to be 20 minutes from now
-                    String userId = ((string)context.Variables.GetValueOrDefault("userId","")); 
-                    
+                    String userId = ((string)context.Variables.GetValueOrDefault("userId",""));
+
                     // Read email and pass it to the JWT. By now the email in shared as is. It MUST be encoded (by pdv) but POST transaction need to updated to not match email address as email field
-                    JObject userAuth = (JObject)context.Variables["userAuthBody"];
-                    String spidEmail = (String)userAuth["spid_email"];
-                    String noticeEmail = (String)userAuth["notice_email"];
-                    String email = String.IsNullOrEmpty(noticeEmail) ? spidEmail : noticeEmail;
-                    
-                    var payload = new { iat, exp, jti, email, userId}; 
+                    // JObject userAuth = (JObject)context.Variables["userAuthBody"];
+                    // String spidEmail = (String)userAuth["spid_email"];
+                    // String noticeEmail = (String)userAuth["notice_email"];
+                    // String email = String.IsNullOrEmpty(noticeEmail) ? spidEmail : noticeEmail;
+                    String email = ((JObject)context.Variables["pmSession"])["data"]["user"]["notificationEmail"].ToString();
+                    var payload = new { iat, exp, jti, email, userId};
                     var jwtPayloadBase64UrlEncoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload))).Replace("/", "_").Replace("+", "-"). Replace("=", "");
-                    
-                    // Construct the Base64Url-encoded signature                
+
+                    // Construct the Base64Url-encoded signature
                     var signature = new HMACSHA512(Convert.FromBase64String("{{pagopa-wallet-session-jwt-signing-key}}")).ComputeHash(Encoding.UTF8.GetBytes($"{jwtHeaderBase64UrlEncoded}.{jwtPayloadBase64UrlEncoded}"));
                     var jwtSignatureBase64UrlEncoded = Convert.ToBase64String(signature).Replace("/", "_").Replace("+", "-"). Replace("=", "");
 
                     // Return the HMAC SHA512-signed JWT as the value for the Authorization header
-                    return $"{jwtHeaderBase64UrlEncoded}.{jwtPayloadBase64UrlEncoded}.{jwtSignatureBase64UrlEncoded}"; 
+                    return $"{jwtHeaderBase64UrlEncoded}.{jwtPayloadBase64UrlEncoded}.{jwtSignatureBase64UrlEncoded}";
                 }" />
             <!-- Token JWT END-->
             <!-- pagoPA platform wallet JWT session token : END -->
         </otherwise>
       </choose>
-      
+
 
       <return-response>
           <set-status code="201" />
@@ -228,4 +228,4 @@
     <on-error>
       <base />
     </on-error>
-  </policies>
\ No newline at end of file
+  </policies>