diff --git a/srsepc/src/mme/mme_gtpc.cc b/srsepc/src/mme/mme_gtpc.cc
index 53277e89c..e1a172600 100644
--- a/srsepc/src/mme/mme_gtpc.cc
+++ b/srsepc/src/mme/mme_gtpc.cc
@@ -216,7 +216,7 @@ mme_gtpc::handle_create_session_response(srslte::gtpc_pdu *cs_resp_pdu)
   //Save create session response info to E-RAB context
   ue_ctx_t *ue_ctx = m_s1ap->find_ue_ctx_from_imsi(imsi);
   if(ue_ctx == NULL){
-    m_mme_gtpc_log->error("Could not find UE context\n");
+    m_mme_gtpc_log->error("Could not find UE context. IMSI %015lu\n", imsi);
     return;
   }
   ue_emm_ctx_t *emm_ctx = &ue_ctx->emm_ctx;
diff --git a/srsepc/src/mme/s1ap_nas_transport.cc b/srsepc/src/mme/s1ap_nas_transport.cc
index 135e99ae2..09affd296 100644
--- a/srsepc/src/mme/s1ap_nas_transport.cc
+++ b/srsepc/src/mme/s1ap_nas_transport.cc
@@ -950,8 +950,8 @@ s1ap_nas_transport::handle_identity_response(srslte::byte_buffer_t *nas_msg, ue_
     return false;
   }
 
-  //Store UE EMM context
-  //m_s1ap->add_new_ue_emm_ctx(ue_emm_ctx);
+  //Store UE context im IMSI map
+  m_s1ap->add_ue_ctx_to_imsi_map(ue_ctx);
 
   //Pack NAS Authentication Request in Downlink NAS Transport msg
   pack_authentication_request(reply_msg, ecm_ctx->enb_ue_s1ap_id, ecm_ctx->mme_ue_s1ap_id, autn, rand);