anchor.diff:  						type = ?Identity, identifier = EapId, data = <<>>},
   				NewEapMessage = ocs_eap_codec:eap_packet(NewEapPacket),
   				NewRequest = Request#diameter_eap_app_DER{'EAP-Payload' = NewEapMessage},
  -				start_fsm(Sup, Address, Port, 5, PasswordReq, SessionId, AuthRequestType,
  -						OHost, ORealm, DHost, DRealm, [], CbProc, NewRequest, State);
  +				start_fsm(Sup, Address, Port, ?EAP_APPLICATION_ID, PasswordReq,
  +						SessionId, AuthRequestType, OHost, ORealm, DHost, DRealm,
  +						[], CbProc, NewRequest, State);
   			{error, none} ->
   				NewEapPacket = #eap_packet{code = failure, identifier = EapId},
   				NewEapMessage = ocs_eap_codec:eap_packet(NewEapPacket),
   				Answer = #diameter_eap_app_DEA{'Session-Id' = SessionId,
  -						'Auth-Application-Id' = 5, 'Auth-Request-Type' = AuthRequestType,
  +						'Auth-Application-Id' = ?EAP_APPLICATION_ID,
  +						'Auth-Request-Type' = AuthRequestType,
   						'Result-Code' = ?'DIAMETER_BASE_RESULT-CODE_UNABLE_TO_COMPLY',
   						'Origin-Host' = OHost, 'Origin-Realm' = ORealm,
   						'EAP-Payload' = [NewEapMessage]},
  
positive.code: 
  -type state() :: #state{}.
  -type capabilities() :: #diameter_caps{}.
  
  %%----------------------------------------------------------------------
  %%  The ocs_diameter_auth_port_server API
  
negative.code: %% @hidden
  request2({_, _Identity}, SessionId, AuthRequestType, none, Address, Port,
  		PasswordReq, OHost, ORealm, DHost, DRealm, Request, CbProc,
  		#state{aka_sup = Sup, method_prefer = aka} = State) ->
  	start_fsm(Sup, Address, Port, ?EAP_APPLICATION_ID, PasswordReq, SessionId,
  			AuthRequestType, OHost, ORealm, DHost, DRealm, [], CbProc, Request, State);
  request2({_, _Identity}, SessionId, AuthRequestType, none, Address, Port,
  		PasswordReq, OHost, ORealm, DHost, DRealm, Request, CbProc,
  		#state{pwd_sup = Sup, method_prefer = pwd} = State) ->
  	start_fsm(Sup, Address, Port, ?EAP_APPLICATION_ID, PasswordReq, SessionId,
  			AuthRequestType, OHost, ORealm, DHost, DRealm, [], CbProc, Request, State);
  request2(none, SessionId, AuthRequestType, none, Address, Port,
  		PasswordReq, OHost, ORealm, DHost, DRealm,
  		#diameter_nas_app_AAR{'User-Name' = [UserName], 'User-Password' = [Password]} = Request,
  		CbProc, #state{simple_auth_sup = Sup} = State) ->
  	start_fsm(Sup, Address, Port, ?NAS_APPLICATION_ID, PasswordReq, SessionId,
  			AuthRequestType, OHost, ORealm, DHost, DRealm, [UserName, Password],
  			CbProc, Request, State);
  request2({legacy_nak, EapId, AlternateMethods},
  