Fixes #19 (SSO LoginEvent Issue)