Better logout handle