anchor.diff:  %% Returns : NewHeader, keylist record()
   %%--------------------------------------------------------------------
   add_caller_identity_for_pstn("INVITE", Header, URI, User, Gateway) when is_record(Header, keylist),
  -									is_record(URI, sipurl),
  -									is_list(User) ->
  +									is_record(URI, sipurl) ->
       case yxa_config:get_env(remote_party_id) of
  -	{ok, true} ->
  +	{ok, true} when is_list(User) ->
   	    case local:get_remote_party_number(User, Header, URI, Gateway) of
   		{ok, RPI, Number} when is_record(RPI, contact), is_list(Number) ->
   		    RemotePartyId = contact:print(RPI),
  
positive.code:     %% non-INVITE request, don't add Remote-Party-Id
      Header.
  
  
  %%--------------------------------------------------------------------
  %% Function: proxy_request(THandler, Request, DstURI)
  
negative.code: 		none ->
  		    %% Add RPI information saying to not show any caller id, in case the From:
  		    %% contains something the gateway interprets as a phone number when it shouldn't
  		    logger:log(debug, "Remote-Party-Id: Blocking Caller-Id for user without number "
  			       "to avoid incorrect/spoofed A-number in PSTN"),
  		    block_remote_party_id(Header)
  	    end;
  	{ok, true} ->
  	    %% non-list User, we should remove any present Remote-Party-Id headers etc.
  	    logger:log(debug, "Remote-Party-Id: Blocking Caller-Id for third party user "
  		       "to avoid incorrect/spoofed A-number in PSTN"),
  	    block_remote_party_id(Header);
  	{ok, false} ->
  	    Header
      end;
  