anchor.diff:      lists:append(get_addresses_for_user(User), get_addresses_for_users(Rest)).
   
   
  -%% Gets all addresses for a user. Used for example
  -%% to check if a request from a user has an acceptable
  -%% From: header.
  +%%--------------------------------------------------------------------
  +%% Function: get_addresses_for_user(User)
  +%%           User = string()
  +%% Descrip.: Get all possible addresses of a user. Both configured
  +%%           ones, and implicit ones. Used for example to check if a
  +%%           request from a user has an acceptable From: header.
  +%% Returns : Addresses |
  +%%           error
  +%%           Addresses = list() of string()
  +%%--------------------------------------------------------------------
   get_addresses_for_user(User) ->
       case phone:get_user(User) of
   	{atomic, []} ->
   	    logger:log(debug, "userdb-mnesia: No such user ~p", [User]),
   	    nomatch;
  -	{atomic, [UserEntry]} ->
  +	{atomic, [_UserEntry]} ->
  +	    %% Ok, user exists
   	    case phone:get_numbers_for_user(User) of
   		{atomic, []} ->
   		    logger:log(debug, "userdb-mnesia: No numbers for user ~p", [User]),
  
positive.code: 			       [Address, Unknown]),
  		    error
  	    end;
  	{atomic, [User]} ->
  	    %% There exists exactly one user with this name. Return the name of the user,
  	    %% not the user record returned from phone:get_user().
  	    Address;
  
negative.code: 	 get_forward_for_user/1
  	]).
  
  %%--------------------------------------------------------------------
  %% Include files
  %%--------------------------------------------------------------------
  -include("siprecords.hrl").
  
  %%--------------------------------------------------------------------
  %% Function: yxa_init()
  %% Descrip.: Perform any necessary startup initialization and
  %%           return an OTP supervisor child spec if we want to add
  %%           to sipserver_sup's list. If this sipuserdb_module
  %%           needs to be persistent, it should be a gen_server and
  %%           init should just return a spec so that the gen_server
  %%           is started by the supervisor.
  %% Returns : Spec |
  %%           []
  %%           Spec = OTP supervisor child specification
  %%--------------------------------------------------------------------
  yxa_init() ->
      [].
  
  %%--------------------------------------------------------------------
  %% Function: get_user_with_address(Address)
  %%           Address = string(), an address in string format.
  %% Descrip.: Looks up exactly one user with an Address. Used for
  %%           example in REGISTER. If there are multiple users with
  %%           this address in our database, this function returns
  %%           'error'.
  %% Returns:  Username |
  %%           nomatch  |
  %%           error
  %%           Username = string()
  %%--------------------------------------------------------------------
  get_user_with_address(Address) ->
      case phone:get_user(Address) of
  	{atomic, []} ->
  