diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js
index 3c97305d..39847064 100644
--- a/web/src/UserEditPage.js
+++ b/web/src/UserEditPage.js
@@ -26,8 +26,8 @@ class UserEditPage extends React.Component {
     super(props);
     this.state = {
       classes: props,
-      organizationName: props.match.params.organizationName,
-      userName: props.match.params.userName,
+      organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
+      userName: props.userName !== undefined ? props.userName : props.match.params.userName,
       user: null,
       organizations: [],
     };
@@ -194,7 +194,10 @@ class UserEditPage extends React.Component {
             organizationName: this.state.user.owner,
             userName: this.state.user.name,
           });
-          this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`);
+
+          if (this.props.history !== undefined) {
+            this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`);
+          }
         } else {
           Setting.showMessage("error", `failed to save: server side failure`);
           this.updateUserField('owner', this.state.organizationName);
diff --git a/web/src/account/AccountPage.js b/web/src/account/AccountPage.js
index b4515f43..1b1a2b75 100644
--- a/web/src/account/AccountPage.js
+++ b/web/src/account/AccountPage.js
@@ -13,77 +13,12 @@
 // limitations under the License.
 
 import React from "react";
-import {Col, Descriptions, Row} from 'antd';
-import * as AccountBackend from "../backend/AccountBackend";
-import * as Setting from "../Setting";
+import UserEditPage from "../UserEditPage";
 
 class AccountPage extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      classes: props,
-      username: props.match.params.username,
-      user: null,
-    };
-  }
-
-  componentWillMount() {
-    this.getUser();
-  }
-
-  getUser() {
-    if (this.state.username !== undefined) {
-      AccountBackend.getUser(this.state.username)
-        .then((user) => {
-          this.setState({
-            user: user,
-          });
-        });
-    }
-  }
-
-  renderValue(key) {
-    if (this.props.account === null || this.props.account === undefined) {
-      return <a href={"/login"}>Please sign in first</a>
-    } else if (this.state.user !== null) {
-      return this.state.user[key];
-    } else {
-      return this.props.account[key];
-    }
-  }
-
-  renderContent() {
-    return (
-      <div>
-        &nbsp;
-        <Descriptions title="My Account" bordered>
-          <Descriptions.Item label="Username">{this.renderValue("name")}</Descriptions.Item>
-          <Descriptions.Item label="Organization">{this.renderValue("owner")}</Descriptions.Item>
-          <Descriptions.Item label="Created At">{Setting.getFormattedDate(this.renderValue("createdTime"))}</Descriptions.Item>
-          <Descriptions.Item label="Password Type">{this.renderValue("passwordType")}</Descriptions.Item>
-          <Descriptions.Item label="Display Name">{this.renderValue("displayName")}</Descriptions.Item>
-          <Descriptions.Item label="E-mail">{this.renderValue("email")}</Descriptions.Item>
-          <Descriptions.Item label="Phone">{this.renderValue("phone")}</Descriptions.Item>
-        </Descriptions>
-      </div>
-    );
-  }
-
   render() {
     return (
-      <div>
-        <Row style={{width: "100%"}}>
-          <Col span={1}>
-          </Col>
-          <Col span={22}>
-            {
-              this.renderContent()
-            }
-          </Col>
-          <Col span={1}>
-          </Col>
-        </Row>
-      </div>
+      <UserEditPage organizationName={this.props.account.owner} userName={this.props.account.name} account={this.props.account} />
     )
   }
 }