diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index 2ba49c5bac..1cc29c8dc6 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -9,7 +9,7 @@
                   'PROJECT_PERFORMANCE_TEST:READ','PROJECT_PERFORMANCE_REPORT:READ', 'ORGANIZATION_USER:READ',
                   'WORKSPACE_USER:READ']">
         <el-dropdown-item :command="item" v-for="(item, index) in workspaceList" :key="index">
-          {{ item.name }} <i class="el-icon-check" v-if="getCurrentWorkspaceId === item.id"/>
+          {{ item.name }} <i class="el-icon-check" v-if="getCurrentWorkspaceId() === item.id"/>
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>
@@ -113,7 +113,7 @@ export default {
     changeWs(data) {
       let workspaceId = data.id;
 
-      if (!workspaceId) {
+      if (!workspaceId || getCurrentWorkspaceId() === workspaceId) {
         return false;
       }
       const loading = fullScreenLoading(this);
diff --git a/frontend/src/business/components/common/head/HeaderUser.vue b/frontend/src/business/components/common/head/HeaderUser.vue
index 2f1bddfd3a..c084414b9d 100644
--- a/frontend/src/business/components/common/head/HeaderUser.vue
+++ b/frontend/src/business/components/common/head/HeaderUser.vue
@@ -9,12 +9,6 @@
         <el-dropdown-item command="about">{{ $t('commons.about_us') }} <i class="el-icon-info"/></el-dropdown-item>
         <el-dropdown-item command="help">{{ $t('commons.help_documentation') }}</el-dropdown-item>
         <el-dropdown-item command="ApiHelp">{{ $t('commons.api_help_documentation') }}</el-dropdown-item>
-        <el-dropdown-item command="old" v-show=isNewVersion @click.native="changeBar('old')">
-          {{ $t('commons.cut_back_old_version') }}
-        </el-dropdown-item>
-        <el-dropdown-item command="new" v-show=isOldVersion @click.native="changeBar('new')">
-          {{ $t('commons.cut_back_new_version') }}
-        </el-dropdown-item>
         <el-dropdown-item command="logout">{{ $t('commons.exit_system') }}</el-dropdown-item>
       </el-dropdown-menu>
     </template>