Added authentication related events which is causing a lot of problems