[TIDOC-1039] Address additional comments.  Fix login event (Cannot use extends for events)