diff --git a/openair3/NAS/COMMON/IES/FGSMobileIdentity.c b/openair3/NAS/COMMON/IES/FGSMobileIdentity.c
index dfe19b4a35..eb139113c6 100644
--- a/openair3/NAS/COMMON/IES/FGSMobileIdentity.c
+++ b/openair3/NAS/COMMON/IES/FGSMobileIdentity.c
@@ -145,7 +145,7 @@ static int encode_guti_5gs_mobile_identity(Guti5GSMobileIdentity_t *guti, uint8_
   *(buffer + encoded) = guti->amfregionid;
   encoded++;
 
-  temp = 0x00 | ((guti->amfsetid & 0x3f) << 6) | (guti->amfpointer & 0x3f);
+  temp = 0x00 | ((guti->amfsetid) << 6) | (guti->amfpointer & 0x3f);
 
   IES_ENCODE_U16(buffer, encoded, temp);
   IES_ENCODE_U32(buffer, encoded, guti->tmsi);
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index 29203dbc47..7c274b2a16 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -112,9 +112,9 @@ void generateRegistrationRequest(as_nas_info_t *initialNasMsg) {
   mm_msg->registration_request.naskeysetidentifier.naskeysetidentifier = NAS_KEY_SET_IDENTIFIER_NOT_AVAILABLE;
   size += 1;
   mm_msg->registration_request.fgsmobileidentity.guti.typeofidentity = FGS_MOBILE_IDENTITY_5G_GUTI;
-//  mm_msg->registration_request.fgsmobileidentity.guti.amfregionid = 1;
-//  mm_msg->registration_request.fgsmobileidentity.guti.amfpointer = 1;
-//  mm_msg->registration_request.fgsmobileidentity.guti.amfsetid = 1;
+  mm_msg->registration_request.fgsmobileidentity.guti.amfregionid = 0xca;
+  mm_msg->registration_request.fgsmobileidentity.guti.amfpointer = 0;
+  mm_msg->registration_request.fgsmobileidentity.guti.amfsetid = 1016;
   mm_msg->registration_request.fgsmobileidentity.guti.tmsi = 10;
   mm_msg->registration_request.fgsmobileidentity.guti.mncdigit1 = 9;
   mm_msg->registration_request.fgsmobileidentity.guti.mncdigit2 = 3;