diff --git a/eiam-console/src/main/console-fe/src/components/UserAvatar/UserAvatar.tsx b/eiam-console/src/main/console-fe/src/components/UserAvatar/UserAvatar.tsx
index 078d52ea..499d4075 100644
--- a/eiam-console/src/main/console-fe/src/components/UserAvatar/UserAvatar.tsx
+++ b/eiam-console/src/main/console-fe/src/components/UserAvatar/UserAvatar.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { Avatar, Image } from 'antd';
-import { AvatarSize } from 'antd/es/avatar/SizeContext';
+import { AvatarSize } from 'antd/es/avatar/AvatarContext';
 
 export default (props: {
   avatar: string;
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserDetail/UserDetail.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserDetail/UserDetail.tsx
index cb98e2ca..504bbb80 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserDetail/UserDetail.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserDetail/UserDetail.tsx
@@ -46,7 +46,7 @@ export default () => {
       history.push(`/account/user`);
       return;
     }
-    if (!type) {
+    if (!type || !UserDetailTabs[type]) {
       setTabActiveKey(UserDetailTabs.user_info);
       history.replace({
         pathname: location.pathname,
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx
index 8cd23ffa..fee130d5 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/UserGroupDetail.tsx
@@ -55,7 +55,7 @@ export default () => {
       history.push(`/account/user-group`);
       return;
     }
-    if (!type) {
+    if (!type || !UserGroupDetailTabs[type]) {
       setTabActiveKey(UserGroupDetailTabs.member);
       history.push({
         pathname: location.pathname,
diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/UpdateUser/UpdateUser.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/UpdateUser/UpdateUser.tsx
index 9dc91c65..a7a61cc4 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/UpdateUser/UpdateUser.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/UpdateUser/UpdateUser.tsx
@@ -99,7 +99,7 @@ const UpdateUser = (props: UpdateFormProps) => {
    */
   const cancel = async () => {
     if (onCancel) {
-      await onCancel();
+      onCancel();
     }
     setSubmitLoading(false);
     form.resetFields();