diff --git a/src/login/LoginPage.jsx b/src/login/LoginPage.jsx
index 04109179..009bdc2a 100644
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -45,7 +45,6 @@ import messages from './messages';
 class LoginPage extends React.Component {
   constructor(props, context) {
     super(props, context);
-    sendPageEvent('login_and_registration', 'login');
     this.state = {
       password: this.props.loginFormData.password,
       emailOrUsername: this.props.loginFormData.emailOrUsername,
@@ -60,6 +59,7 @@ class LoginPage extends React.Component {
   }
 
   componentDidMount() {
+    sendPageEvent('login_and_registration', 'login');
     const payload = { ...this.queryParams };
 
     if (this.tpaHint) {
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index d72fdd88..be2259dd 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -62,7 +62,6 @@ import { getLevenshteinSuggestion, getSuggestionForInvalidEmail } from './utils'
 class RegistrationPage extends React.Component {
   constructor(props, context) {
     super(props, context);
-    sendPageEvent('login_and_registration', 'register');
     this.handleOnClose = this.handleOnClose.bind(this);
     this.countryList = getCountryList(getLocale());
     this.queryParams = getAllPossibleQueryParam();
@@ -99,6 +98,7 @@ class RegistrationPage extends React.Component {
   }
 
   componentDidMount() {
+    sendPageEvent('login_and_registration', 'register');
     const payload = { ...this.queryParams };
     window.optimizely = window.optimizely || [];
     window.optimizely.push({