diff --git a/src/hss/hss-context.c b/src/hss/hss-context.c
index ee066f483..a4741fef8 100644
--- a/src/hss/hss-context.c
+++ b/src/hss/hss-context.c
@@ -856,16 +856,6 @@ char *hss_cx_download_user_data(
     for (i = 0; i < ims_data->num_of_msisdn; i++) {
         char *public_identity = NULL;
 
-        public_identity = ogs_msprintf("tel:%s", ims_data->msisdn[i].bcd);
-        ogs_assert(public_identity);
-        hss_cx_associate_identity(user_name, public_identity);
-        ogs_free(public_identity);
-
-        public_identity = ogs_msprintf("sip:%s", ims_data->msisdn[i].bcd);
-        ogs_assert(public_identity);
-        hss_cx_associate_identity(user_name, public_identity);
-        ogs_free(public_identity);
-
         public_identity = ogs_msprintf(
                 "sip:%s@ims.mnc%03d.mcc%03d.3gppnetwork.org",
                 ims_data->msisdn[i].bcd,
@@ -873,6 +863,11 @@ char *hss_cx_download_user_data(
         ogs_assert(public_identity);
         hss_cx_associate_identity(user_name, public_identity);
         ogs_free(public_identity);
+
+        public_identity = ogs_msprintf("tel:%s", ims_data->msisdn[i].bcd);
+        ogs_assert(public_identity);
+        hss_cx_associate_identity(user_name, public_identity);
+        ogs_free(public_identity);
     }