diff --git a/web/src/App.js b/web/src/App.js
index 0955be69..86fbc233 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -309,11 +309,11 @@ class App extends Component {
           </Menu>
         </Header>
         <Switch>
-          <Route exact path="/register" render={(props) => this.renderHomeIfLoggedIn(<RegisterPage onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
+          <Route exact path="/register" render={(props) => this.renderHomeIfLoggedIn(<RegisterPage {...props} />)}/>
           <Route exact path="/result" render={(props) => this.renderHomeIfLoggedIn(<ResultPage {...props} />)}/>
-          <Route exact path="/login" render={(props) => this.renderHomeIfLoggedIn(<SelfLoginPage onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
+          <Route exact path="/login" render={(props) => this.renderHomeIfLoggedIn(<SelfLoginPage {...props} />)}/>
           <Route exact path="/callback" component={AuthCallback}/>
-          <Route exact path="/" render={(props) => this.renderLoginIfNotLoggedIn(<HomePage account={this.state.account} onLoggedIn={this.onLoggedIn.bind(this)} {...props} />)}/>
+          <Route exact path="/" render={(props) => this.renderLoginIfNotLoggedIn(<HomePage account={this.state.account} {...props} />)}/>
           <Route exact path="/account" render={(props) => this.renderLoginIfNotLoggedIn(<AccountPage account={this.state.account} {...props} />)}/>
           <Route exact path="/organizations" render={(props) => this.renderLoginIfNotLoggedIn(<OrganizationListPage account={this.state.account} {...props} />)}/>
           <Route exact path="/organizations/:organizationName" render={(props) => this.renderLoginIfNotLoggedIn(<OrganizationEditPage account={this.state.account} {...props} />)}/>
diff --git a/web/src/auth/AuthCallback.js b/web/src/auth/AuthCallback.js
index a3d7647b..c0b58a7c 100644
--- a/web/src/auth/AuthCallback.js
+++ b/web/src/auth/AuthCallback.js
@@ -74,7 +74,6 @@ class AuthCallback extends React.Component {
         if (res.status === 'ok') {
           const responseType = this.getResponseType();
           if (responseType === "login") {
-            // this.props.onLoggedIn();
             Util.showMessage("success", `Logged in successfully`);
             Util.goToLink("/");
           } else if (responseType === "code") {
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index 547cd96a..3b58b578 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -88,7 +88,6 @@ class LoginPage extends React.Component {
         if (res.status === 'ok') {
           const responseType = this.state.type;
           if (responseType === "login") {
-            // this.props.onLoggedIn();
             Util.showMessage("success", `Logged in successfully`);
             Util.goToLink("/");
           } else if (responseType === "code") {
diff --git a/web/src/auth/SelfLoginPage.js b/web/src/auth/SelfLoginPage.js
index 78026749..d8e249d1 100644
--- a/web/src/auth/SelfLoginPage.js
+++ b/web/src/auth/SelfLoginPage.js
@@ -19,7 +19,7 @@ import {authConfig} from "./Auth";
 class SelfLoginPage extends React.Component {
   render() {
     return (
-      <LoginPage type={"login"} applicationName={authConfig.appName} account={this.props.account} onLoggedIn={this.props.onLoggedIn.bind(this)} {...this.props} />
+      <LoginPage type={"login"} applicationName={authConfig.appName} account={this.props.account} {...this.props} />
     )
   }
 }