diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 9947e37..81496e7 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -515,6 +515,13 @@ typedef enum {
 	MEDIA_OPT_BYPASS_AFTER_ATT_XFER = (1 << 1)
 } sofia_media_options_t;
 
+typedef enum {
+       PAID_DEFAULT = 0,
+       PAID_USER,
+       PAID_USER_DOMAIN,
+       PAID_VERBATIM
+} sofia_paid_type_t;
+
 #define MAX_RTPIP 50
 
 struct sofia_profile {
@@ -652,6 +659,7 @@ struct sofia_profile {
 	uint32_t sip_force_expires;
 	uint32_t sip_expires_max_deviation;
 	int ireg_seconds;
+	sofia_paid_type_t paid_type;
 };
 
 struct private_object {
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 2cab209..94dba3d 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -3477,6 +3477,18 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
 						} else {
 							profile->sip_expires_max_deviation = 0;
 						}
+					} else if (!strcasecmp(var, "p-asserted-id-parse")) {
+						if (!strncasecmp(val, "default", 7)) {
+							profile->paid_type = PAID_DEFAULT;
+						} else if (!strncasecmp(val, "user-only", 9)) {
+							profile->paid_type = PAID_USER;
+						} else if (!strncasecmp(val, "user-domain", 11)) {
+							profile->paid_type = PAID_USER_DOMAIN;
+						} else if (!strncasecmp(val, "verbatim", 8)) {
+							profile->paid_type = PAID_VERBATIM;
+						} else {
+							profile->paid_type = PAID_DEFAULT;
+						}
 					}
 				}
 			}
@@ -3724,6 +3736,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
 				profile->ndlb |= PFLAG_NDLB_ALLOW_NONDUP_SDP;
 				profile->te = 101;
 				profile->ireg_seconds = IREG_SECONDS;
+				profile->paid_type = PAID_DEFAULT;
 
 
                                 profile->tls_verify_policy = TPTLS_VERIFY_NONE;
@@ -4551,6 +4564,18 @@ switch_status_t config_sofia(int reload, char *profile_name)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_NO_CONNECTION_REUSE);
 						}
+					} else if (!strcasecmp(var, "p-asserted-id-parse")) {
+						if (!strncasecmp(val, "default", 7)) {
+							profile->paid_type = PAID_DEFAULT;
+						} else if (!strncasecmp(val, "user-only", 9)) {
+							profile->paid_type = PAID_USER;
+						} else if (!strncasecmp(val, "user-domain", 11)) {
+							profile->paid_type = PAID_USER_DOMAIN;
+						} else if (!strncasecmp(val, "verbatim", 8)) {
+							profile->paid_type = PAID_VERBATIM;
+						} else {
+							profile->paid_type = PAID_DEFAULT;
+						}
 					}
 				}
 
@@ -7753,9 +7778,17 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 	if ((passerted = sip_p_asserted_identity(sip))) {
 		if (passerted->paid_url && passerted->paid_url->url_user) {
 			char *full_paid_header = sip_header_as_string(nh->nh_home, (void *) passerted);
+			//char *full_paid_header = (char *)(passerted->paid_common->h_data);
 			from_user = passerted->paid_url->url_user;
 			if (!zstr(full_paid_header)) {
-				switch_channel_set_variable(channel, "sip_P-Asserted-Identity", from_user);
+				if (profile->paid_type == PAID_DEFAULT || profile->paid_type == PAID_USER) {
+					switch_channel_set_variable(channel, "sip_P-Asserted-Identity", from_user);
+				} else if (profile->paid_type == PAID_USER_DOMAIN) {
+					switch_channel_set_variable(channel, "sip_P-Asserted-Identity",
+								switch_core_session_sprintf(session, "%s@%s", passerted->paid_url->url_user, passerted->paid_url->url_host));
+				} else if (profile->paid_type == PAID_VERBATIM) {
+					switch_channel_set_variable(channel, "sip_P-Asserted-Identity",  full_paid_header);
+				}
 			}
 		}
 		if (!zstr(passerted->paid_display)) {