diff --git a/package.json b/package.json
index 7865e15a7..fe73371e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azion-platform-kit",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "private": true,
   "type": "module",
   "repository": {
diff --git a/src/router/routes/users-routes/index.js b/src/router/routes/users-routes/index.js
index 9c42a4522..112579ed3 100644
--- a/src/router/routes/users-routes/index.js
+++ b/src/router/routes/users-routes/index.js
@@ -58,7 +58,7 @@ export const usersListsRoutes = {
         listTimezonesService: UsersService.listTimezonesService,
         listTeamsService: UsersService.listTeamsService,
         editAnotherUserService: UsersService.editAnotherUserService,
-        loadUserService: UsersService.loadUserService,
+        loadAnotherUserService: UsersService.loadAnotherUserService,
         updatedRedirect: 'list-users'
       },
       meta: {
diff --git a/src/services/edge-application-functions-services/loader-function-service.js b/src/services/edge-application-functions-services/loader-function-service.js
index 46e989eca..89c0647c0 100644
--- a/src/services/edge-application-functions-services/loader-function-service.js
+++ b/src/services/edge-application-functions-services/loader-function-service.js
@@ -17,7 +17,7 @@ const adapt = (httpResponse) => {
     id: httpResponse.body.results.id,
     edgeFunctionID: httpResponse.body.results.edge_function_id,
     name: httpResponse.body.results.name,
-    args: JSON.stringify(httpResponse.body.results.args)
+    args: JSON.stringify(httpResponse.body.results.args, null, '\t')
   }
 
   return {
diff --git a/src/services/edge-firewall-functions-services/loader-function-service.js b/src/services/edge-firewall-functions-services/loader-function-service.js
index a36805493..c8b99abdb 100644
--- a/src/services/edge-firewall-functions-services/loader-function-service.js
+++ b/src/services/edge-firewall-functions-services/loader-function-service.js
@@ -17,7 +17,7 @@ const adapt = (httpResponse) => {
     id: httpResponse.body.results.id,
     edgeFunctionID: httpResponse.body.results.edge_function,
     name: httpResponse.body.results.name,
-    args: JSON.stringify(httpResponse.body.results.json_args)
+    args: JSON.stringify(httpResponse.body.results.json_args, null, '\t')
   }
 
   return {
diff --git a/src/services/edge-service-resources-services/make-resources-base-url.js b/src/services/edge-service-resources-services/make-resources-base-url.js
index 976468403..f7fa3cbe7 100644
--- a/src/services/edge-service-resources-services/make-resources-base-url.js
+++ b/src/services/edge-service-resources-services/make-resources-base-url.js
@@ -1,3 +1,4 @@
 export const makeResourcesBaseUrl = () => {
-  return `edge_services`
+  const version = 'v3'
+  return `${version}/edge_services`
 }
diff --git a/src/services/users-services/create-users-service.js b/src/services/users-services/create-users-service.js
index 7eedec547..96d12d753 100644
--- a/src/services/users-services/create-users-service.js
+++ b/src/services/users-services/create-users-service.js
@@ -21,7 +21,7 @@ const adapt = (payload) => {
     email: payload.email,
     language: payload.language,
     timezone: payload.timezone,
-    country_call_code: payload.countryCallCode.value,
+    country_call_code: payload.countryCallCode,
     mobile: payload.mobile?.toString(),
     is_account_owner: payload.isAccountOwner,
     teams_ids: payload.teamsIds,
diff --git a/src/services/users-services/edit-another-user-service.js b/src/services/users-services/edit-another-user-service.js
index 0e7d4b5be..e31c3dfd2 100644
--- a/src/services/users-services/edit-another-user-service.js
+++ b/src/services/users-services/edit-another-user-service.js
@@ -21,7 +21,7 @@ const adapt = (payload) => {
     email: payload.email,
     language: payload.language,
     timezone: payload.timezone,
-    country_call_code: payload.countryCallCode.value,
+    country_call_code: payload.countryCallCode,
     mobile: payload.mobile?.toString(),
     is_account_owner: payload.isAccountOwner,
     teams_ids: payload.teamsIds,
diff --git a/src/services/users-services/index.js b/src/services/users-services/index.js
index b18b8a0e6..1dbf2be51 100644
--- a/src/services/users-services/index.js
+++ b/src/services/users-services/index.js
@@ -9,6 +9,7 @@ import { listTeamsService } from './list-teams-service'
 import { editAnotherUserService } from './edit-another-user-service'
 import { loadUserService } from './load-user-service'
 import { editUsersService } from './edit-users-service'
+import { loadAnotherUserService } from './load-another-user-service'
 
 export {
   listUsersService,
@@ -21,5 +22,6 @@ export {
   listTeamsService,
   loadUserService,
   editAnotherUserService,
-  editUsersService
+  editUsersService,
+  loadAnotherUserService
 }
diff --git a/src/services/users-services/load-another-user-service.js b/src/services/users-services/load-another-user-service.js
new file mode 100644
index 000000000..944277287
--- /dev/null
+++ b/src/services/users-services/load-another-user-service.js
@@ -0,0 +1,41 @@
+import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter'
+import { makeUsersBaseUrl } from './make-users-base-url'
+
+export const loadAnotherUserService = async ({ id }) => {
+  let httpResponse = await AxiosHttpClientAdapter.request({
+    url: `${makeUsersBaseUrl()}/${id}`,
+    method: 'GET'
+  })
+  httpResponse = adapt(httpResponse)
+
+  return parseHttpResponse(httpResponse)
+}
+
+const adapt = (httpResponse) => {
+  const responseData = httpResponse.body.data
+  const parsedUser = {
+    id: responseData.id,
+    firstName: responseData.first_name,
+    lastName: responseData.last_name,
+    email: responseData.email,
+    language: responseData.language,
+    timezone: responseData.timezone,
+    countryCallCode: responseData.country_call_code,
+    mobile: responseData.mobile,
+    isAccountOwner: responseData.is_account_owner,
+    teamsIds: responseData.teams.map((value) => value.id),
+    twoFactorEnabled: responseData.two_factor_enabled,
+    dateJoined: responseData.date_joined,
+    isActive: responseData.is_active,
+    isStaff: responseData.is_staff,
+    isTrial: responseData.is_trial,
+    lastLogin: responseData.last_login,
+    phone: responseData.phone,
+    teams: responseData.teams
+  }
+
+  return {
+    body: parsedUser,
+    statusCode: httpResponse.statusCode
+  }
+}
diff --git a/src/templates/create-form-block/index.vue b/src/templates/create-form-block/index.vue
index a94b888f5..19768175c 100644
--- a/src/templates/create-form-block/index.vue
+++ b/src/templates/create-form-block/index.vue
@@ -41,7 +41,7 @@
     return blockViewRedirection.value && isDirty.value
   })
 
-  const { meta, errors, handleSubmit, isSubmitting, values } = useForm({
+  const { meta, errors, handleSubmit, isSubmitting, values, resetForm } = useForm({
     validationSchema: props.schema,
     initialValues: props.initialValues
   })
@@ -90,7 +90,10 @@
 <template>
   <div class="flex flex-col min-h-[calc(100vh-300px)]">
     <form class="w-full grow flex flex-col gap-8 max-md:gap-6">
-      <slot name="form" />
+      <slot
+        name="form"
+        :resetForm="resetForm"
+      />
       <slot name="raw-form" />
     </form>
     <DialogUnsavedBlock :blockRedirectUnsaved="formHasChanges" />
diff --git a/src/templates/list-table-block/dialog/delete-dialog.vue b/src/templates/list-table-block/dialog/delete-dialog.vue
index 275f6ef0a..19e748145 100644
--- a/src/templates/list-table-block/dialog/delete-dialog.vue
+++ b/src/templates/list-table-block/dialog/delete-dialog.vue
@@ -18,8 +18,9 @@
           class="w-100"
           severity="warn"
           :closable="false"
-          >Once confirmed, this action can't be reversed.</Message
         >
+          Once confirmed, this action can't be reversed.
+        </Message>
 
         <p class="pt-3.5 text-color-secondary">
           This {{ informationForDeletion.title }} will be deleted along with any associated settings
@@ -112,10 +113,13 @@
   })
 
   const loading = ref(false)
+  const canDelete = ref(false)
   const deleteDialogVisible = ref(false)
 
   const removeItem = async () => {
+    if (canDelete.value === false) return
     if (!meta.value.valid) return
+
     loading.value = true
     let toastConfig = {
       closable: true,
@@ -162,10 +166,20 @@
     () => props.informationForDeletion,
     (value) => {
       if (value) {
+        canDelete.value = false
         resetForm()
         deleteDialogVisible.value = props.informationForDeletion.deleteDialogVisible
       }
     },
     { deep: true }
   )
+  watch(
+    () => confirmation.value,
+    (value) => {
+      if (value) {
+        canDelete.value = true
+      }
+    },
+    { deep: true }
+  )
 </script>
diff --git a/src/tests/services/edge-application-functions-services/load-function-service.test.js b/src/tests/services/edge-application-functions-services/load-function-service.test.js
index 536eb2398..5dd2c51a6 100644
--- a/src/tests/services/edge-application-functions-services/load-function-service.test.js
+++ b/src/tests/services/edge-application-functions-services/load-function-service.test.js
@@ -51,7 +51,7 @@ describe('LoaderFunctionService', () => {
       id: fixture.functionInstance.id,
       edgeFunctionID: fixture.functionInstance.edge_function_id,
       name: fixture.functionInstance.name,
-      args: JSON.stringify(fixture.functionInstance.args)
+      args: JSON.stringify(fixture.functionInstance.args, null, '\t')
     })
   })
 
diff --git a/src/tests/services/edge-firewall-functions-services/load-function-service.test.js b/src/tests/services/edge-firewall-functions-services/load-function-service.test.js
index ec084fb02..cb2fc6cae 100644
--- a/src/tests/services/edge-firewall-functions-services/load-function-service.test.js
+++ b/src/tests/services/edge-firewall-functions-services/load-function-service.test.js
@@ -51,7 +51,7 @@ describe('EdgeFirewallFunctionsServices', () => {
       id: fixture.functionInstance.id,
       edgeFunctionID: fixture.functionInstance.edge_function,
       name: fixture.functionInstance.name,
-      args: JSON.stringify(fixture.functionInstance.json_args)
+      args: JSON.stringify(fixture.functionInstance.json_args, null, '\t')
     })
   })
 
diff --git a/src/tests/services/edge-service-resources-services/create-resources-services.test.js b/src/tests/services/edge-service-resources-services/create-resources-services.test.js
index 914aef0b5..ba5add877 100644
--- a/src/tests/services/edge-service-resources-services/create-resources-services.test.js
+++ b/src/tests/services/edge-service-resources-services/create-resources-services.test.js
@@ -26,14 +26,14 @@ describe('EdgeServiceResourcesServices', () => {
       statusCode: 201,
       body: { id: '123' }
     })
-
+    const version = 'v3'
     const { sut } = makeSut()
 
     await sut(fixtures.mock)
 
     expect(requestSpy).toHaveBeenCalledWith({
       method: 'POST',
-      url: `edge_services/${fixtures.mock.id}/resources`,
+      url: `${version}/edge_services/${fixtures.mock.id}/resources`,
       body: {
         name: 'X Edge Service',
         trigger: 'TEST',
diff --git a/src/tests/services/edge-service-resources-services/delete-resources-services.test.js b/src/tests/services/edge-service-resources-services/delete-resources-services.test.js
index 091881d2a..5fec7921b 100644
--- a/src/tests/services/edge-service-resources-services/delete-resources-services.test.js
+++ b/src/tests/services/edge-service-resources-services/delete-resources-services.test.js
@@ -23,13 +23,13 @@ describe('EdgeServiceResourcesServices', () => {
     const requestSpy = vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
       statusCode: 204
     })
+    const version = 'v3'
     const { sut } = makeSut()
-
     await sut(fixtures.mock)
 
     expect(requestSpy).toHaveBeenCalledWith({
       method: 'DELETE',
-      url: `edge_services/${fixtures.mock.edgeServiceId}/resources/${fixtures.mock.id}`
+      url: `${version}/edge_services/${fixtures.mock.edgeServiceId}/resources/${fixtures.mock.id}`
     })
   })
 
diff --git a/src/tests/services/edge-service-resources-services/edit-resources-services.test.js b/src/tests/services/edge-service-resources-services/edit-resources-services.test.js
index a89a1ca05..465ad4330 100644
--- a/src/tests/services/edge-service-resources-services/edit-resources-services.test.js
+++ b/src/tests/services/edge-service-resources-services/edit-resources-services.test.js
@@ -34,13 +34,14 @@ describe('EdgeServiceResourcesServices', () => {
       statusCode: 200,
       body: fixtures.mockResponse
     })
+    const version = 'v3'
     const { sut } = makeSut()
 
     await sut(fixtures.mockPayload)
     const { id, edgeServiceId } = fixtures.mockPayload
 
     expect(requestSpy).toHaveBeenCalledWith({
-      url: `edge_services/${edgeServiceId}/resources/${id}`,
+      url: `${version}/edge_services/${edgeServiceId}/resources/${id}`,
       method: 'PATCH',
       body: fixtures.mockResponse
     })
diff --git a/src/tests/services/edge-service-resources-services/list-resources-services.test.js b/src/tests/services/edge-service-resources-services/list-resources-services.test.js
index 24d683d70..f2a32889d 100644
--- a/src/tests/services/edge-service-resources-services/list-resources-services.test.js
+++ b/src/tests/services/edge-service-resources-services/list-resources-services.test.js
@@ -53,13 +53,13 @@ describe('EdgeServiceResourcesServices', () => {
     })
     const edgeServiceIdMock = 1
     const { sut } = makeSut()
-
+    const version = 'v3'
     await sut({
       id: edgeServiceIdMock
     })
 
     expect(requestSpy).toHaveBeenCalledWith({
-      url: `edge_services/${edgeServiceIdMock}/resources?filter=&order_by=name&sort=asc&page=1&page_size=200`,
+      url: `${version}/edge_services/${edgeServiceIdMock}/resources?filter=&order_by=name&sort=asc&page=1&page_size=200`,
       method: 'GET'
     })
   })
diff --git a/src/tests/services/edge-service-resources-services/load-resources-services.test.js b/src/tests/services/edge-service-resources-services/load-resources-services.test.js
index d42942773..92ea8cd68 100644
--- a/src/tests/services/edge-service-resources-services/load-resources-services.test.js
+++ b/src/tests/services/edge-service-resources-services/load-resources-services.test.js
@@ -29,13 +29,14 @@ describe('EdgeServiceResourcesServices', () => {
     const id = 812783
     const edgeServiceId = 7879123
     const { sut } = makeSut()
+    const version = 'v3'
 
     await sut({
       id,
       edgeServiceId
     })
     expect(requestSpy).toHaveBeenCalledWith({
-      url: `edge_services/${edgeServiceId}/resources/${id}`,
+      url: `${version}/edge_services/${edgeServiceId}/resources/${id}`,
       method: 'GET'
     })
   })
diff --git a/src/tests/services/edge-service-resources-services/make-resources-base-url.test.js b/src/tests/services/edge-service-resources-services/make-resources-base-url.test.js
index b50529fed..02c8a413f 100644
--- a/src/tests/services/edge-service-resources-services/make-resources-base-url.test.js
+++ b/src/tests/services/edge-service-resources-services/make-resources-base-url.test.js
@@ -12,7 +12,8 @@ const makeSut = () => {
 describe('EdgeServiceServices', () => {
   it('should return the API base url to edge services service', () => {
     const { sut } = makeSut()
-    const correctApiUrl = 'edge_services'
+    const version = 'v3'
+    const correctApiUrl = `${version}/edge_services`
 
     const baseUrl = sut()
 
diff --git a/src/tests/services/users-services/create-users-service.test.js b/src/tests/services/users-services/create-users-service.test.js
index ed2e7f32c..dd3490058 100644
--- a/src/tests/services/users-services/create-users-service.test.js
+++ b/src/tests/services/users-services/create-users-service.test.js
@@ -10,7 +10,7 @@ const fixtures = {
     timezone: 'America/New_York',
     language: 'en_US',
     email: 'johndoe@example.com',
-    countryCallCode: { value: 'AF +93' },
+    countryCallCode: 'AF +93',
     mobile: '+1-123-456-7890',
     isAccountOwner: true,
     teamsIds: 1,
@@ -43,7 +43,7 @@ describe('UsersServices', () => {
         last_name: fixtures.userMock.lastName,
         timezone: fixtures.userMock.timezone,
         language: fixtures.userMock.language,
-        country_call_code: fixtures.userMock.countryCallCode.value,
+        country_call_code: fixtures.userMock.countryCallCode,
         email: fixtures.userMock.email,
         mobile: fixtures.userMock.mobile,
         is_account_owner: fixtures.userMock.isAccountOwner,
diff --git a/src/tests/services/users-services/edit-user-service.test.js b/src/tests/services/users-services/edit-user-service.test.js
index f6396a99d..45f75c2b8 100644
--- a/src/tests/services/users-services/edit-user-service.test.js
+++ b/src/tests/services/users-services/edit-user-service.test.js
@@ -11,11 +11,7 @@ const fixtures = {
     timezone: 'GMT',
     language: 'en',
     email: 'test.test@azion.com',
-    countryCallCode: {
-      label: 'AL (Albania) +355',
-      labelFormat: 'AL +355',
-      value: 'AL - 355'
-    },
+    countryCallCode: 'AL - 355',
     mobile: 12312312,
     isAccountOwner: false,
     teamsIds: [1580],
@@ -49,7 +45,7 @@ describe('UsersService', () => {
         timezone: fixtures.userMock.timezone,
         language: fixtures.userMock.language,
         email: fixtures.userMock.email,
-        country_call_code: fixtures.userMock.countryCallCode.value,
+        country_call_code: fixtures.userMock.countryCallCode,
         mobile: fixtures.userMock.mobile.toString(),
         is_account_owner: fixtures.userMock.isAccountOwner,
         teams_ids: fixtures.userMock.teamsIds,
diff --git a/src/tests/services/users-services/load-another-user-service.test.js b/src/tests/services/users-services/load-another-user-service.test.js
new file mode 100644
index 000000000..e1c8b0337
--- /dev/null
+++ b/src/tests/services/users-services/load-another-user-service.test.js
@@ -0,0 +1,84 @@
+import { AxiosHttpClientAdapter } from '@/services/axios/AxiosHttpClientAdapter'
+import { loadAnotherUserService } from '@/services/users-services'
+import { describe, expect, it, vi } from 'vitest'
+
+const fixtures = {
+  userMock: {
+    id: 4462,
+    last_login: '2023-12-08T11:35:55.072822Z',
+    first_name: 'test name',
+    last_name: 'test last name',
+    email: 'test@azion.com',
+    is_staff: false,
+    is_active: false,
+    phone: null,
+    country_call_code: 'AL - 355',
+    mobile: '16993388829',
+    date_joined: '2023-12-08T11:35:55.072822Z',
+    timezone: 'GMT',
+    language: 'en',
+    is_trial: false,
+    two_factor_enabled: false,
+    is_account_owner: false,
+    teams: [{ id: 1580, name: 'Default Team', is_active: true }]
+  }
+}
+
+const makeSut = () => {
+  const sut = loadAnotherUserService
+
+  return {
+    sut
+  }
+}
+
+describe('UsersServices', () => {
+  it('should call api with correct params', async () => {
+    const requestSpy = vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 200,
+      body: { data: fixtures.userMock }
+    })
+
+    const { sut } = makeSut()
+
+    const userId = fixtures.userMock.id
+    await sut({ id: userId })
+
+    const version = 'v4'
+    expect(requestSpy).toHaveBeenCalledWith({
+      url: `${version}/iam/users/${userId}`,
+      method: 'GET'
+    })
+  })
+
+  it('should parse correctly each returned item', async () => {
+    vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 200,
+      body: { data: fixtures.userMock }
+    })
+    const { sut } = makeSut()
+
+    const result = await sut({ id: fixtures.userMock.id })
+
+    expect(result).toEqual({
+      id: fixtures.userMock.id,
+      firstName: fixtures.userMock.first_name,
+      lastName: fixtures.userMock.last_name,
+      email: fixtures.userMock.email,
+      countryCallCode: fixtures.userMock.country_call_code,
+      mobile: fixtures.userMock.mobile,
+      timezone: fixtures.userMock.timezone,
+      language: fixtures.userMock.language,
+      twoFactorEnabled: fixtures.userMock.two_factor_enabled,
+      isAccountOwner: fixtures.userMock.is_account_owner,
+      teamsIds: [fixtures.userMock.teams[0].id],
+      dateJoined: fixtures.userMock.date_joined,
+      isActive: fixtures.userMock.is_active,
+      isStaff: fixtures.userMock.is_staff,
+      isTrial: fixtures.userMock.is_trial,
+      lastLogin: fixtures.userMock.last_login,
+      phone: fixtures.userMock.phone,
+      teams: fixtures.userMock.teams
+    })
+  })
+})
diff --git a/src/views/EdgeApplicationsFunctions/FormFields/FormFieldsEdgeApplicationsFunctions.vue b/src/views/EdgeApplicationsFunctions/FormFields/FormFieldsEdgeApplicationsFunctions.vue
index b4748cea2..5d6c850e7 100644
--- a/src/views/EdgeApplicationsFunctions/FormFields/FormFieldsEdgeApplicationsFunctions.vue
+++ b/src/views/EdgeApplicationsFunctions/FormFields/FormFieldsEdgeApplicationsFunctions.vue
@@ -95,7 +95,8 @@
           class="min-h-[200px] overflow-clip surface-border border rounded-md"
         />
         <small class="text-color-secondary text-sm">
-          Customize the arguments in JSON format. Once set, they can be called in code using <code>event.args("arg_name")</code>.
+          Customize the arguments in JSON format. Once set, they can be called in code using
+          <code>event.args("arg_name")</code>.
         </small>
       </div>
     </template>
diff --git a/src/views/EdgeFirewall/TabsView.vue b/src/views/EdgeFirewall/TabsView.vue
index abe52ae2f..01e86d46f 100644
--- a/src/views/EdgeFirewall/TabsView.vue
+++ b/src/views/EdgeFirewall/TabsView.vue
@@ -127,7 +127,7 @@
           />
         </TabPanel>
         <TabPanel
-          header="Functions"
+          header="Functions Instances"
           v-if="isEnableFunction"
         >
           <EdgeFirewallFunctionsListView
diff --git a/src/views/Users/CreateView.vue b/src/views/Users/CreateView.vue
index eba82e7c2..7504a1a10 100644
--- a/src/views/Users/CreateView.vue
+++ b/src/views/Users/CreateView.vue
@@ -7,10 +7,10 @@
       <CreateFormBlock
         :createService="props.createUsersService"
         :schema="validationSchema"
-        :initialValues="initialValues"
       >
-        <template #form>
+        <template #form="{ resetForm }">
           <FormFieldsUsers
+            :resetForm="resetForm"
             :loadAccountDetailsService="loadAccountDetailsService"
             :listTimezonesService="listTimezonesService"
             :listCountriesPhoneService="listCountriesPhoneService"
@@ -67,18 +67,10 @@
     timezone: yup.string().required('Timezone is a required field.'),
     language: yup.string(),
     email: yup.string().email().required('Email is a required field.').max(254),
-    countryCallCode: yup.object().required('Country is a required field.'),
+    countryCallCode: yup.string().required('Country is a required field.'),
     mobile: yup.string().required('Phone Number is a required field.').max(20),
     isAccountOwner: yup.boolean(),
     teamsIds: yup.array(),
     twoFactorEnabled: yup.boolean()
   })
-
-  const initialValues = {
-    isAccountOwner: false,
-    mobile: '',
-    selectedTeam: [],
-    twoFactorEnabled: false,
-    selectedLanguage: 'en'
-  }
 </script>
diff --git a/src/views/Users/EditView.vue b/src/views/Users/EditView.vue
index 069956b95..b2ced1f15 100644
--- a/src/views/Users/EditView.vue
+++ b/src/views/Users/EditView.vue
@@ -34,7 +34,7 @@
       type: Function,
       required: true
     },
-    loadUserService: {
+    loadAnotherUserService: {
       type: Function,
       required: true
     }
@@ -46,7 +46,7 @@
     timezone: yup.string().required().label('Timezone'),
     language: yup.string(),
     email: yup.string().email().max(254).required().label('Email'),
-    countryCallCode: yup.object().required().label('Country'),
+    countryCallCode: yup.string().required().label('Country'),
     mobile: yup.string().max(20).required().label('Phone Number'),
     isAccountOwner: yup.boolean(),
     teamsIds: yup.array(),
@@ -72,7 +72,7 @@
   const route = useRoute()
   const loadUser = async () => {
     const id = route.params.id
-    const userData = await props.loadUserService({ id })
+    const userData = await props.loadAnotherUserService({ id })
 
     currentEmail.value = userData.email
 
diff --git a/src/views/Users/FormsFields/FormFieldsUsers.vue b/src/views/Users/FormsFields/FormFieldsUsers.vue
index 2739cc8b9..6f7f58bee 100644
--- a/src/views/Users/FormsFields/FormFieldsUsers.vue
+++ b/src/views/Users/FormsFields/FormFieldsUsers.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref, onMounted } from 'vue'
+  import { ref } from 'vue'
   import { useField } from 'vee-validate'
   import { useAccountStore } from '@/stores/account'
   import { storeToRefs } from 'pinia'
@@ -30,6 +30,9 @@
       type: Function,
       required: true
     },
+    resetForm: {
+      type: Function
+    },
     isEditForm: {
       type: Boolean,
       default: false
@@ -58,29 +61,30 @@
   const { value: twoFactorEnabled, errorMessage: errorTwoFactorEnabled } =
     useField('twoFactorEnabled')
 
-  const fetchCountries = async () => {
-    const countries = await props.listCountriesPhoneService()
-    setCountries(countries)
-    setCountryCallCodeBasedOnFormType()
-  }
-  const setCountries = (countries) => {
+  const setCountriesOptions = (countries) => {
     optionsCountriesMobile.value = countries
     filteredCountriesMobile.value = [...countries]
   }
-  const setCountryCallCodeBasedOnFormType = () => {
+
+  const fetchCountries = async () => {
+    const countries = await props.listCountriesPhoneService()
+    setCountriesOptions(countries)
+
     if (props.isEditForm) {
       setCountryCallCodeForEditForm()
     } else {
-      setCountryCallCodeForNewForm()
+      const firstCountry = optionsCountriesMobile.value[0].value
+      return firstCountry
     }
+
+    return
   }
-  const setCountryCallCodeForNewForm = () => {
-    countryCallCode.value = optionsCountriesMobile.value[0]
-  }
+
   const setCountryCallCodeForEditForm = () => {
-    countryCallCode.value = filteredCountriesMobile.value.find(
+    const loadedCountryCallCode = filteredCountriesMobile.value.find(
       (country) => country.value === countryCallCode.value
     )
+    countryCallCode.value = loadedCountryCallCode.value
   }
 
   const fetchTimezone = async () => {
@@ -88,28 +92,54 @@
     optionsTimezone.value = result.listTimeZones
 
     if (!props.isEditForm) {
-      timezone.value = result.defaultSelected
+      return result.defaultSelected
     }
+    return
   }
   const fetchDetailAccount = async () => {
     const account = await props.loadAccountDetailsService()
     isForceMFA.value = account?.is_enabled_mfa_to_all_users
 
     if (!props.isEditForm) {
-      twoFactorEnabled.value = isForceMFA.value
+      return !!isForceMFA.value
     }
+    return
   }
   const fetchTeams = async () => {
     const result = await props.listTeamsService()
     optionsTeams.value = result
-    if (!props.isEditForm) teamsIds.value = [result[0].value]
+
+    if (!props.isEditForm) {
+      const firstTeamId = result[0].value
+      return firstTeamId
+    }
+
+    return
+  }
+  const initializeFormValues = async () => {
+    const defaultTeamId = await fetchTeams()
+    const initialCountry = await fetchCountries()
+    const initialTimezone = await fetchTimezone()
+    const forceMfaEnabled = await fetchDetailAccount()
+
+    if (!props.isEditForm) {
+      const initialValues = {
+        firstName: '',
+        lastName: '',
+        timezone: initialTimezone,
+        language: '',
+        email: '',
+        countryCallCode: initialCountry,
+        mobile: '',
+        isAccountOwner: false,
+        teamsIds: [defaultTeamId],
+        twoFactorEnabled: forceMfaEnabled,
+        selectedLanguage: 'en'
+      }
+
+      props.resetForm({ values: initialValues })
+    }
   }
-  onMounted(async () => {
-    await fetchCountries()
-    await fetchTimezone()
-    await fetchTeams()
-    await fetchDetailAccount()
-  })
 
   const handleisAccountOwner = () => {
     if (!isAccountOwner.value) {
@@ -119,7 +149,10 @@
 
   accountIsOwner.value = account?.is_account_owner
   isAccountOwner.value = accountIsOwner.value
+
+  initializeFormValues()
 </script>
+
 <template>
   <FormHorizontal title="General">
     <template #inputs>
@@ -238,6 +271,7 @@
               :options="filteredCountriesMobile"
               optionLabel="labelFormat"
               placeholder="Loading..."
+              optionValue="value"
               :loading="!filteredCountriesMobile.length"
               :class="{ 'p-invalid': errorCountryCallCode }"
               class="surface-border border-r-0 w-1/4"
diff --git a/src/views/YourSettings/FormFields/FormFieldsYourSettings.vue b/src/views/YourSettings/FormFields/FormFieldsYourSettings.vue
index bf62f33a5..89fc82b10 100644
--- a/src/views/YourSettings/FormFields/FormFieldsYourSettings.vue
+++ b/src/views/YourSettings/FormFields/FormFieldsYourSettings.vue
@@ -26,19 +26,17 @@
   const optionsCountriesMobile = ref([])
   const filteredCountriesMobile = ref([])
   const optionsLanguage = ref([{ label: 'English', value: 'en' }])
+  const selectedCountryCallCode = ref(null)
 
   const { value: firstName, errorMessage: errorFirstName } = useField('firstName')
   const { value: lastName, errorMessage: errorLastName } = useField('lastName')
   const { value: timezone, errorMessage: errorTimezone } = useField('timezone')
   const { value: language, errorMessage: errorLanguage } = useField('language')
   const { value: email, errorMessage: errorEmail } = useField('email')
-  const { value: countryCallCode } = useField('countryCallCode')
-  const { value: selectedCountryCallCode, errorMessage: errorSelectedCountryCallCode } =
-    useField('selectedCountryCallCode')
+  const { value: countryCallCode, errorMessage: errorCountryCallCode } = useField('countryCallCode')
   const { value: mobile, errorMessage: errorMobile } = useField('mobile')
   const { value: twoFactorEnabled, errorMessage: errorTwoFactorEnabled } =
     useField('twoFactorEnabled')
-
   const { value: password, errorMessage: errorPassword } = useField('password')
   const { value: oldPassword, errorMessage: errorOldPassword } = useField('oldPassword')
   const { value: confirmPassword, errorMessage: errorConfirmPassword } = useField('confirmPassword')
@@ -62,9 +60,9 @@
     optionsTimezone.value = result.listTimeZones
   }
 
-  onMounted(() => {
-    fetchCountries()
-    fetchTimezone()
+  onMounted(async () => {
+    await fetchCountries()
+    await fetchTimezone()
   })
 
   const passwordRequirementsList = ref([
@@ -234,7 +232,7 @@
               optionLabel="labelFormat"
               placeholder="Loading..."
               :loading="isLoadingCountry"
-              :class="{ 'p-invalid': errorSelectedCountryCallCode }"
+              :class="{ 'p-invalid': errorCountryCallCode }"
               class="w-2/3 surface-border border-r-0"
               v-model="selectedCountryCallCode"
             >
@@ -278,7 +276,8 @@
           v-model="oldPassword"
           id="oldPassword"
           class="w-full"
-          autocomplete="off"
+          autocomplete="new-password"
+          :inputProps="{ autocomplete: 'new-password' }"
           :feedback="false"
         />
         <small
@@ -297,7 +296,7 @@
           toggleMask
           v-model="password"
           id="password"
-          autocomplete="off"
+          autocomplete="new-password"
           class="w-full"
           :class="{ 'p-invalid': errorPassword }"
           @input="validation()"