This paper proposes enhanced failover for Diameter-based AAA system. Diameter application layer watchdog algorithm enables failover from a server that has failed. SCTP heartbeat is used to perform failover between interfaces. This paper adopts both of them to provide efficient failover by inspecting state of connection with peer as well as state of Diameter application of peer. Proposed failover method that enables Diameter node to use alternative server as well as alternative communication path provides fiexible and efficient failover to Diameter node. . . .