diff --git a/frontend/src/pages/oj/components/Header.vue b/frontend/src/pages/oj/components/Header.vue
index 8ffe70785..6c61a6f09 100644
--- a/frontend/src/pages/oj/components/Header.vue
+++ b/frontend/src/pages/oj/components/Header.vue
@@ -27,8 +27,7 @@
       </template>
       <template v-slot:content v-else>
         <button v-if="isAdminRole" @click="goManagement()" class="flex w-full justify-between items-center rounded-lg px-3 py-1 my-1 text-base font-medium text-text-title hover:text-green hover:no-underline">Management</button>
-        <a class="flex w-full justify-between items-center rounded-lg px-3 py-1 my-1 text-base text-text-title font-medium hover:text-green hover:no-underline" href="/#">Settings</a>
-        <button class="flex w-full justify-between items-center rounded-lg px-3 py-1 my-1 text-base text-text-title font-medium hover:text-green hover:no-underline" @click="goProfile()">My Profile</button>
+        <button v-if="!isAdminRole" class="flex w-full justify-between items-center rounded-lg px-3 py-1 my-1 text-base text-text-title font-medium hover:text-green hover:no-underline" @click="goProfile()">My Profile</button>
         <a class="flex w-full justify-between items-center rounded-lg px-3 py-1 my-1 text-base text-text-title hover:text-green hover:no-underline" href="/logout">Sign Out</a>
       </template>
     </dropdown>
diff --git a/frontend/src/pages/oj/components/user/UserSetting.vue b/frontend/src/pages/oj/components/user/UserSetting.vue
index 7a4be338b..7f8ab3397 100644
--- a/frontend/src/pages/oj/components/user/UserSetting.vue
+++ b/frontend/src/pages/oj/components/user/UserSetting.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="profile-setting">
-    <div class="setting-main font-bold">
-      <div class="section-title logo-title font-bold">
+    <div class="setting-main">
+      <div class="section-title logo-title">
         <h2>Setting</h2>
       </div>
       <div style="display:flex; flex-direction:row; margin-bottom:12px;" class="profileSetting">
@@ -278,7 +278,6 @@ export default {
   }
   .logo-title {
     margin:8px 0 16px 0;
-    color: #8DC63F;
     text-align:center;
   }
   .font-bold {
diff --git a/frontend/src/pages/oj/views/index.js b/frontend/src/pages/oj/views/index.js
index e6f1f9a77..c12ca5109 100644
--- a/frontend/src/pages/oj/views/index.js
+++ b/frontend/src/pages/oj/views/index.js
@@ -24,7 +24,8 @@ const ResetPassword = () => import(/* webpackChunkName: "password" */ '@oj/views
 const EmailAuth = () => import(/* webpackChunkName: "emailAuth" */ '@oj/views/user/EmailAuth.vue')
 const Register = () => import('@oj/views/user/Register.vue')
 
-const ProfileSetting = () => import(/* webpackChunckName: "setting" */ '@oj/views/user/ProfileSetting.vue')
+/* const ProfileSetting = () => import(/* webpackChunckName: "setting" */
+/* '@oj/views/user/ProfileSetting.vue') */
 
 const ContestList = () => import(/* webpackChunkName: "contest" */ '@oj/views/contest/ContestList.vue')
 const ContestDetail = () => import(/* webpackChunkName: "contest" */ '@oj/views/contest/ContestDetail.vue')
@@ -32,7 +33,7 @@ const ContestDetail = () => import(/* webpackChunkName: "contest" */ '@oj/views/
 export {
   Home, NotFound,
   Logout, ProblemList, Announcement, AnnouncementList, Problem, ProblemSet,
-  ApplyResetPassword, ResetPassword, EmailAuth, ProfileSetting,
+  ApplyResetPassword, ResetPassword, EmailAuth,
   ContestList, ContestDetail, ContestProblemList, ContestRanking, Register,
   LectureList, LectureDashboard, LectureAssignmentList, LectureAssignmentDetail, LectureQna, LectureQnaDetail,
   Profile
diff --git a/frontend/src/pages/oj/views/problem/Problem.vue b/frontend/src/pages/oj/views/problem/Problem.vue
index 847a00da3..c706ded3e 100644
--- a/frontend/src/pages/oj/views/problem/Problem.vue
+++ b/frontend/src/pages/oj/views/problem/Problem.vue
@@ -93,7 +93,7 @@
         centered
         modal-class="modal-med modal-big"
       >
-        <profileSetting></profileSetting>
+        <UserSetting></UserSetting>
       </b-modal>
 
       <b-navbar id="inner-header" type="dark">
@@ -337,7 +337,7 @@ import ProblemSidebar from './ProblemSidebar.vue'
 import moment from 'moment'
 import register from '@oj/views/user/Register'
 import login from '@oj/views/user/Login'
-import profileSetting from '@oj/views/user/ProfileSetting'
+import UserSetting from '@oj/components/user/UserSetting'
 import Table from '@oj/components/Table.vue'
 import VueResizable from 'vue-resizable'
 
@@ -350,7 +350,8 @@ export default {
     register,
     profileSetting,
     Table,
-    VueResizable
+    VueResizable,
+    UserSetting
   },
   mixins: [FormMixin],
   data () {
diff --git a/frontend/src/pages/oj/views/user/Profile.vue b/frontend/src/pages/oj/views/user/Profile.vue
index 8e9bd6726..d2a8e1d03 100644
--- a/frontend/src/pages/oj/views/user/Profile.vue
+++ b/frontend/src/pages/oj/views/user/Profile.vue
@@ -16,7 +16,7 @@
       <profile-badge v-show="currentTab==='Badge'"></profile-badge>
       <profile-storage v-show="currentTab==='Storage'"></profile-storage>
       <profile-group v-if="currentTab==='Group'"></profile-group>
-      <UserSetting v-if="currentTab==='Setting'"></UserSetting>
+      <user-setting v-if="currentTab==='Setting'"></user-setting>
     </div>
   </div>
 </template>
@@ -56,12 +56,12 @@ export default {
         'Submission',
         'History',
         'Contest',
-        'Badge',
-        'Setting'
+        'Badge'
       ],
       rightTabs: [
         'Storage',
-        'Group'
+        'Group',
+        'Setting'
       ],
       currentTab: 'Summary'
     }