diff --git a/package.json b/package.json
index 11c21d109..737c08690 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azion-platform-kit",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "private": true,
   "type": "module",
   "repository": {
@@ -22,6 +22,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@feedback-fish/vue": "^1.0.1",
     "@guolao/vue-monaco-editor": "^1.3.0",
     "@vee-validate/yup": "^4.11.1",
     "@vueuse/core": "^10.7.0",
@@ -46,7 +47,6 @@
     "@commitlint/config-conventional": "^17.7.0",
     "@rushstack/eslint-patch": "^1.3.2",
     "@tailwindcss/typography": "^0.5.10",
-    "caniuse-lite": "^1.0.30001584",
     "@types/c3": "^0.7.11",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
@@ -55,6 +55,7 @@
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.1",
     "autoprefixer": "^10.4.14",
+    "caniuse-lite": "^1.0.30001584",
     "cypress": "13.5.0",
     "eslint": "^8.45.0",
     "eslint-plugin-cypress": "^2.13.3",
diff --git a/src/router/routes/password-routes/index.js b/src/router/routes/password-routes/index.js
index 08f9c5775..39433944f 100644
--- a/src/router/routes/password-routes/index.js
+++ b/src/router/routes/password-routes/index.js
@@ -6,11 +6,12 @@ export const passwordRoutes = {
   name: 'new-password',
   children: [
     {
-      path: 'new/:uidb64/:token',
+      path: 'new/:uidb64/:token?',
       name: 'reset-password',
       component: () => import('@views/NewPassword/NewPasswordView.vue'),
       props: {
-        resetPasswordService: AuthServices.resetPasswordService
+        resetPasswordService: AuthServices.resetPasswordService,
+        passwordSettingService: AuthServices.passwordSettingService
       },
       meta: {
         isPublic: true,
diff --git a/src/services/auth-services/index.js b/src/services/auth-services/index.js
index 1f913e00b..9735a203f 100644
--- a/src/services/auth-services/index.js
+++ b/src/services/auth-services/index.js
@@ -5,6 +5,7 @@ import { refreshAuthenticationService } from './refresh-authentication-service'
 import { logoutService } from './logout-service'
 import { sendResetPasswordEmailService } from './send-reset-password-email-service'
 import { resetPasswordService } from './reset-password-service'
+import { passwordSettingService } from './password-setting-service'
 
 export {
   loginService,
@@ -13,5 +14,6 @@ export {
   switchAccountService,
   logoutService,
   sendResetPasswordEmailService,
-  resetPasswordService
+  resetPasswordService,
+  passwordSettingService
 }
diff --git a/src/services/auth-services/make-password-setting-service-base-url.js b/src/services/auth-services/make-password-setting-service-base-url.js
new file mode 100644
index 000000000..dedb16123
--- /dev/null
+++ b/src/services/auth-services/make-password-setting-service-base-url.js
@@ -0,0 +1,4 @@
+export const makePasswordSettingServiceBaseUrl = () => {
+  const version = 'v4'
+  return `${version}/iam/user/password`
+}
diff --git a/src/services/auth-services/password-setting-service.js b/src/services/auth-services/password-setting-service.js
new file mode 100644
index 000000000..cb2d713f3
--- /dev/null
+++ b/src/services/auth-services/password-setting-service.js
@@ -0,0 +1,52 @@
+import { AxiosHttpClientAdapter } from '@/services/axios/AxiosHttpClientAdapter'
+import * as Errors from '@/services/axios/errors'
+import { makePasswordSettingServiceBaseUrl } from './make-password-setting-service-base-url'
+
+export const passwordSettingService = async (payload) => {
+  let httpResponse = await AxiosHttpClientAdapter.request({
+    url: makePasswordSettingServiceBaseUrl(),
+    method: 'POST',
+    body: payload
+  })
+  return parseHttpResponse(httpResponse)
+}
+
+/**
+ * @param {Object} httpResponse - The HTTP response object.
+ * @param {Object} httpResponse.body - The response body.
+ * @param {String} httpResponse.statusCode - The HTTP status code.
+ * @returns {Object} The result message based on the status code.
+ * @throws {Error} If there is an error with the response.
+ */
+
+const parseHttpResponse = (httpResponse) => {
+  switch (httpResponse.statusCode) {
+    case 200:
+      return httpResponse.body
+    case 400:
+      throw new Error(extractApiError(httpResponse.body, 'non_field_errors')).message
+    case 403:
+      throw new Errors.PermissionError().message
+    case 404:
+      throw new Error(extractApiError(httpResponse.body, 'detail')).message
+    case 500:
+      throw new Errors.InternalServerError().message
+    default:
+      throw new Errors.UnexpectedError().message
+  }
+}
+
+/**
+ * @param {Object} errorSchema - The error schema.
+ * @param {string} key - The error key of error schema.
+ * @returns {string} The result message based on the status code.
+ */
+const extractApiError = (errorSchema, key) => {
+  const errorMessage = errorSchema[key] || 'Unexpected error.'
+
+  if (errorMessage === 'Not found.') {
+    return 'Token not found.'
+  }
+
+  return errorMessage
+}
diff --git a/src/templates/dialog-unsaved-block/index.vue b/src/templates/dialog-unsaved-block/index.vue
index 87ea32d56..21cb37e46 100644
--- a/src/templates/dialog-unsaved-block/index.vue
+++ b/src/templates/dialog-unsaved-block/index.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { computed, ref } from 'vue'
+  import { computed, ref, watch, inject } from 'vue'
   import PrimeDialog from 'primevue/dialog'
   import PrimeButton from 'primevue/button'
   import { onBeforeRouteLeave, useRouter } from 'vue-router'
@@ -14,14 +14,25 @@
     },
     blockRedirectUnsaved: {
       type: Boolean
+    },
+    isTabs: {
+      type: Boolean,
+      default: false
     }
   })
 
   const router = useRouter()
+  const currentRouter = router.currentRoute.value.name
   const showDialog = ref(props.visible)
-  const redirectToUnsaved = ref('home')
+  const redirectToUnsaved = ref(currentRouter)
   const unsavedDisabled = ref(false)
 
+  let changeTab, tabHasUpdate, formHasUpdated, visibleOnSaved
+
+  if (props.isTabs) {
+    ({ changeTab, tabHasUpdate, formHasUpdated, visibleOnSaved } = inject('unsaved'))
+  }
+
   const visibleDialog = computed({
     get: () => showDialog.value,
     set: (value) => {
@@ -35,18 +46,25 @@
   }
 
   const onLeavePage = () => {
-    unsavedDisabled.value = true
-    openDialogUnsaved(false)
-    if (!redirectToUnsaved.value) {
-      router.go(-1)
-      return
+    if (props.isTabs && (redirectToUnsaved.value === currentRouter)) {
+      visibleOnSaved.value = true
+      changeTab(tabHasUpdate.nextTab)
+      openDialogUnsaved(false)
+    } else {
+      unsavedDisabled.value = true
+      openDialogUnsaved(false)
+      if (!redirectToUnsaved.value) {
+        router.go(-1)
+        return
+      }
+  
+      router.push({ name: redirectToUnsaved.value })
     }
-
-    router.push({ name: redirectToUnsaved.value })
   }
 
   const onKeepEditing = () => {
     openDialogUnsaved(false)
+    visibleOnSaved.value = false
   }
 
   onBeforeRouteLeave((to, from, next) => {
@@ -57,6 +75,14 @@
     }
     return next()
   })
+
+  watch(tabHasUpdate, () => {
+    if (formHasUpdated.value) {
+      visibleOnSaved.value = true
+      openDialogUnsaved(true)
+      changeTab(tabHasUpdate.oldTab)
+    }
+  })
 </script>
 
 <template>
diff --git a/src/templates/edit-form-block/index.vue b/src/templates/edit-form-block/index.vue
index 7643eb996..29771f4f2 100644
--- a/src/templates/edit-form-block/index.vue
+++ b/src/templates/edit-form-block/index.vue
@@ -2,7 +2,7 @@
   import DialogUnsavedBlock from '@/templates/dialog-unsaved-block'
   import { useToast } from 'primevue/usetoast'
   import { useForm, useIsFormDirty } from 'vee-validate'
-  import { computed, ref } from 'vue'
+  import { computed, ref, watch, inject } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   defineOptions({ name: 'edit-form-block' })
@@ -44,11 +44,23 @@
     validationSchema: props.schema
   })
 
+  let formHasUpdated, visibleOnSaved
+
+  if (props.isTabs) {
+    ({ formHasUpdated, visibleOnSaved } = inject('unsaved'))
+  }
+
+  const isDirty = useIsFormDirty()
+
   const formHasChanges = computed(() => {
-    const isDirty = useIsFormDirty()
     return blockViewRedirection.value && isDirty.value
   })
 
+  watch(formHasChanges, () => {
+    formHasUpdated.value = formHasChanges
+    visibleOnSaved.value = false
+  })
+
   const goBackToList = () => {
     if (props.updatedRedirect) {
       router.push({ name: props.updatedRedirect })
@@ -115,7 +127,7 @@
     </form>
   </div>
 
-  <DialogUnsavedBlock :blockRedirectUnsaved="formHasChanges" />
+  <DialogUnsavedBlock :blockRedirectUnsaved="formHasChanges" :isTabs="isTabs" />
   <slot
     name="action-bar"
     :onSubmit="onSubmit"
diff --git a/src/templates/form-fields-inputs/fieldSwitch.vue b/src/templates/form-fields-inputs/fieldSwitch.vue
index 4e2fb796f..986c285db 100644
--- a/src/templates/form-fields-inputs/fieldSwitch.vue
+++ b/src/templates/form-fields-inputs/fieldSwitch.vue
@@ -28,7 +28,7 @@
   />
   <label
     :for="inputName"
-    class="flex flex-col items-start gap-1"
+    class="flex flex-col text-sm items-start gap-1"
   >
     <span class="text-color text-sm font-normal leading-5">{{ props.label }} </span>
     <span
diff --git a/src/templates/list-table-block/no-header.vue b/src/templates/list-table-block/no-header.vue
index 2d2abdc93..2ee4cf3c0 100644
--- a/src/templates/list-table-block/no-header.vue
+++ b/src/templates/list-table-block/no-header.vue
@@ -107,7 +107,7 @@
             </div>
           </template>
           <template #body="{ data: rowData }">
-            <div class="flex justify-end">
+            <div class="flex justify-end" v-if="showActions">
               <PrimeMenu
                 ref="menu"
                 id="overlay_menu"
@@ -259,6 +259,7 @@
 
   const MINIMUN_OF_ITEMS_PER_PAGE = 10
 
+  const showActions = ref(true)
   const selectedId = ref(null)
   const filters = ref({ global: { value: '', matchMode: FilterMatchMode.CONTAINS } })
   const isLoading = ref(false)
@@ -285,13 +286,13 @@
   })
 
   const actionOptions = (showAuthorize) => {
-    const actionOptions = [
+    const actionOptions = props.deleteService? [
       {
         label: 'Delete',
         icon: 'pi pi-fw pi-trash',
         command: () => openDeleteDialog()
       }
-    ]
+    ] : []
     if (props.authorizeNode && showAuthorize !== 'Authorized') {
       actionOptions.push({
         label: 'Authorize',
@@ -299,6 +300,7 @@
         command: () => authorizeEdgeNode()
       })
     }
+    showActions.value = actionOptions.length > 0
     return actionOptions
   }
 
diff --git a/src/templates/navbar-block/feedback-fish.vue b/src/templates/navbar-block/feedback-fish.vue
new file mode 100644
index 000000000..2b14942f8
--- /dev/null
+++ b/src/templates/navbar-block/feedback-fish.vue
@@ -0,0 +1,37 @@
+<template>
+  <FeedbackFish :projectId="projectId" />
+
+  <PrimeButton
+    :label="currentLabel"
+    data-feedback-fish
+    :data-feedback-fish-userid="user.email"
+    :pt="{
+      label: { class: 'text-white' },
+      icon: { class: 'text-white' }
+    }"
+    icon="pi pi-flag"
+    size="small"
+    class="text-white border-header bg-header hover:bg-header-button-hover"
+    v-tooltip.bottom="{ value: 'Feedback', showDelay: 200 }"
+  />
+</template>
+
+<script setup>
+  import { computed, inject } from 'vue'
+  import { FeedbackFish } from '@feedback-fish/vue'
+  import { useAccountStore } from '@/stores/account'
+  import PrimeButton from 'primevue/button'
+
+  const projectId = '2566aa41e7e334'
+
+  const SCREEN_BREAKPOINT_MD = 768
+  const currentWidth = inject('currentWidth')
+  const user = useAccountStore().accountData
+
+  const currentLabel = computed(() => {
+    if (currentWidth.value > SCREEN_BREAKPOINT_MD) {
+      return 'Feedback'
+    }
+    return ''
+  })
+</script>
diff --git a/src/templates/navbar-block/index.vue b/src/templates/navbar-block/index.vue
index 8362a4128..54d286f79 100644
--- a/src/templates/navbar-block/index.vue
+++ b/src/templates/navbar-block/index.vue
@@ -29,6 +29,7 @@
       <div class="flex gap-2 items-center ml-auto">
         <Create />
         <Help />
+        <FeedbackFish />
         <ProfileBlock />
       </div>
     </div>
@@ -50,6 +51,7 @@
   import AzionMobileLogo from '@assets/svg/mobile-logo'
   import SidebarBlock from '@templates/sidebar-block'
   import Create from './create'
+  import FeedbackFish from './feedback-fish'
   import Help from './help'
   import SwitchAccount from './switch-account'
   import ProfileBlock from '@templates/profile-block'
diff --git a/src/templates/profile-block/index.vue b/src/templates/profile-block/index.vue
index 718dfabda..22f6a2f4c 100644
--- a/src/templates/profile-block/index.vue
+++ b/src/templates/profile-block/index.vue
@@ -199,6 +199,7 @@
 <script setup>
   import { ref, computed, inject, watch } from 'vue'
   import { useAccountStore } from '@/stores/account'
+  import { getEnvironmentFromUrl } from '@/helpers'
 
   import Sidebar from 'primevue/sidebar'
   import Avatar from 'primevue/avatar'
@@ -227,8 +228,9 @@
     {
       label: 'Billing & Subscriptions',
       command: () => {
-        let billingLink = 'https://manager.azion.com/billing-subscriptions/payment-methods'
-        if (import.meta.env.DEV) {
+        const environment = getEnvironmentFromUrl(window.location.href)
+        let billingLink = 'https://manager.azion.com/billing-subscriptions/bills'
+        if (environment === 'stage') {
           billingLink = 'https://stage-manager.azion.com/billing-subscriptions/bills'
         }
         window.open(billingLink, '_blank')
diff --git a/src/templates/sign-in-block/reset-password.vue b/src/templates/sign-in-block/reset-password.vue
index 2bbfcf3f4..6a977a420 100644
--- a/src/templates/sign-in-block/reset-password.vue
+++ b/src/templates/sign-in-block/reset-password.vue
@@ -121,13 +121,13 @@
 </template>
 
 <script setup>
-  import Password from 'primevue/password'
   import PrimeButton from 'primevue/button'
   import InlineMessage from 'primevue/inlinemessage'
-  import * as yup from 'yup'
+  import Password from 'primevue/password'
+  import { useField, useForm } from 'vee-validate'
   import { computed, ref } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
-  import { useField, useForm } from 'vee-validate'
+  import * as yup from 'yup'
 
   const MATCH_ERROR_MESSAGE = 'The passwords do not match'
   const isMatchError = computed(() => {
@@ -148,7 +148,8 @@
   ])
 
   const props = defineProps({
-    resetPasswordService: { type: Function, required: true }
+    resetPasswordService: { type: Function, required: true },
+    passwordSettingService: { type: Function, required: true }
   })
 
   const validationSchema = yup.object({
@@ -185,11 +186,19 @@
       const { uidb64, token } = route.params
 
       const payload = {
-        password: values.password,
-        uidb64,
-        token
+        password: values.password
+      }
+
+      if (!token) {
+        payload.token = uidb64
+
+        await props.passwordSettingService(payload)
+      } else {
+        payload.uidb64 = uidb64
+        payload.token = token
+
+        await props.resetPasswordService(payload)
       }
-      await props.resetPasswordService(payload)
 
       isPasswordReseted.value = true
     } catch (err) {
diff --git a/src/tests/services/auth-services/password-setting-service.test.js b/src/tests/services/auth-services/password-setting-service.test.js
new file mode 100644
index 000000000..14eee1db4
--- /dev/null
+++ b/src/tests/services/auth-services/password-setting-service.test.js
@@ -0,0 +1,90 @@
+import { passwordSettingService } from '@/services/auth-services/password-setting-service'
+import { AxiosHttpClientAdapter } from '@/services/axios/AxiosHttpClientAdapter'
+import * as Errors from '@/services/axios/errors'
+import { describe, expect, it, vi } from 'vitest'
+
+const fixtures = {
+  payload: {
+    password: 'SomeTest123@',
+    token: 'uuid123-testuuid123'
+  },
+  tokenInvalidMessage: 'Your token is expired. Please, request a new one.',
+  tokenNotFoundMessage: 'Token not found.'
+}
+
+const makeSut = () => {
+  const sut = passwordSettingService
+
+  return {
+    sut
+  }
+}
+
+describe('AuthServices', () => {
+  it('should call API with correct params', async () => {
+    const requestSpy = vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 200
+    })
+
+    const { sut } = makeSut()
+
+    await sut(fixtures.payload)
+
+    expect(requestSpy).toHaveBeenCalledWith({
+      url: 'v4/iam/user/password',
+      method: 'POST',
+      body: fixtures.payload
+    })
+  })
+
+  it('should throw when token is expired', async () => {
+    vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 400,
+      body: { non_field_errors: [fixtures.tokenInvalidMessage] }
+    })
+    const { sut } = makeSut()
+
+    const request = sut()
+
+    expect(request).rejects.toBe(fixtures.tokenInvalidMessage)
+  })
+
+  it('should throw when token is not found', async () => {
+    vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 404,
+      body: { detail: [fixtures.tokenNotFoundMessage] }
+    })
+    const { sut } = makeSut()
+
+    const request = sut()
+
+    expect(request).rejects.toBe(fixtures.tokenNotFoundMessage)
+  })
+
+  it.each([
+    {
+      statusCode: 403,
+      expectedError: new Errors.PermissionError().message
+    },
+    {
+      statusCode: 500,
+      expectedError: new Errors.InternalServerError().message
+    },
+    {
+      statusCode: 'unmappedStatusCode',
+      expectedError: new Errors.UnexpectedError().message
+    }
+  ])(
+    'should throw when request fails with status code $statusCode',
+    async ({ statusCode, expectedError }) => {
+      vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+        statusCode
+      })
+      const { sut } = makeSut()
+
+      const request = sut()
+
+      expect(request).rejects.toBe(expectedError)
+    }
+  )
+})
diff --git a/src/views/EdgeApplications/CreateView.vue b/src/views/EdgeApplications/CreateView.vue
index 75ef324f1..ac7a41bf1 100644
--- a/src/views/EdgeApplications/CreateView.vue
+++ b/src/views/EdgeApplications/CreateView.vue
@@ -55,7 +55,7 @@
     deliveryProtocol: 'http',
     http3: false,
     httpPort: [{ name: '80 (Default)', value: '80' }],
-    httpsPort: [{ name: '8008', value: '8008' }],
+    httpsPort: [{ name: '443 (Default)', value: '443' }],
     minimumTlsVersion: { label: 'None', value: '' },
     supportedVersion: { label: 'All', value: 'all' },
     originType: { label: 'Single Origin', value: 'single_origin' },
diff --git a/src/views/EdgeApplications/TabsView.vue b/src/views/EdgeApplications/TabsView.vue
index 371a1e8cc..ca05d104d 100644
--- a/src/views/EdgeApplications/TabsView.vue
+++ b/src/views/EdgeApplications/TabsView.vue
@@ -10,7 +10,7 @@
   import TabPanel from 'primevue/tabpanel'
   import TabView from 'primevue/tabview'
   import { useToast } from 'primevue/usetoast'
-  import { computed, ref } from 'vue'
+  import { computed, ref, reactive, provide, watch } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
   import EditView from './EditView.vue'
 
@@ -46,6 +46,9 @@
   const edgeApplicationId = ref(route.params.id)
   const edgeApplication = ref()
 
+  const tabHasUpdate = reactive({ oldTab: null, nextTab: 0, updated: true })
+  const formHasUpdated = ref(false)
+
   const showMainSettings = computed(() => {
     return activeTab.value === mapTabs.value?.mainSettings
   })
@@ -95,20 +98,6 @@
     return selectedTab
   }
 
-  const changeRouteByClickingOnTab = ({ index = 0 }) => {
-    verifyTab(edgeApplication.value)
-    const tab = getTabFromValue(index)
-    activeTab.value = index
-    const params = {
-      id: edgeApplicationId.value,
-      tab
-    }
-    router.push({
-      name: 'edit-edge-application',
-      params
-    })
-  }
-
   const verifyTab = ({ edgeFunctions }) => {
     if (!edgeFunctions) {
       delete mapTabs.value.functions
@@ -154,6 +143,43 @@
     verifyTab(edgeApplication.value)
   }
 
+  const changeRouteByClickingOnTab = ({ index = 0 }) => {
+    changeTab(index)
+  }
+
+  const changeTab = (index) => {
+    verifyTab(edgeApplication.value)
+    const tab = getTabFromValue(index)
+    activeTab.value = index
+    const params = {
+      id: edgeApplicationId.value,
+      tab
+    }
+    router.push({
+      name: 'edit-edge-application',
+      params
+    })
+  }
+
+  const visibleOnSaved = ref(false)
+
+  provide('unsaved', {
+    changeTab,
+    tabHasUpdate,
+    formHasUpdated,
+    visibleOnSaved
+  })
+
+  watch(activeTab, (newValue, oldValue) => {
+    if (visibleOnSaved.value) {
+      return
+    } else {
+      tabHasUpdate.oldTab = oldValue
+      tabHasUpdate.nextTab = newValue
+      tabHasUpdate.updated = Math.random()
+    }
+  })
+
   renderTabCurrentRouter()
 </script>
 
@@ -175,6 +201,7 @@
             :editEdgeApplicationService="edgeApplicationServices.editEdgeApplication"
             :edgeApplication="edgeApplication"
             :updatedRedirect="edgeApplicationServices.updatedRedirect"
+            :isTab="true"
             @updatedApplication="updatedApplication"
             :contactSalesEdgeApplicationService="
               edgeApplicationServices.contactSalesEdgeApplicationService
diff --git a/src/views/EdgeFirewall/TabsView.vue b/src/views/EdgeFirewall/TabsView.vue
index 9aa03e7d8..968e87f55 100644
--- a/src/views/EdgeFirewall/TabsView.vue
+++ b/src/views/EdgeFirewall/TabsView.vue
@@ -8,7 +8,7 @@
   import EdgeFirewallRulesEngineListView from '@/views/EdgeFirewallRulesEngine/ListView'
   import { useToast } from 'primevue/usetoast'
 
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, ref, watch, provide, reactive, onMounted } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   defineOptions({ name: 'tabs-edge-firewall' })
@@ -34,6 +34,9 @@
   const edgeFirewallId = ref(route.params.id)
   const edgeFirewall = ref()
 
+  const tabHasUpdate = reactive({ oldTab: null, nextTab: 0, updated: true })
+  const formHasUpdated = ref(false)
+
   const loaderEdgeFirewall = async () => {
     try {
       return await props.edgeFirewallServices.loadEdgeFirewallService({
@@ -57,17 +60,7 @@
   }
 
   const changeRouteByClickingOnTab = ({ index = 0 }) => {
-    verifyTab(edgeFirewall.value)
-    const tab = getTabFromValue(index)
-    activeTab.value = index
-    const params = {
-      id: edgeFirewallId.value,
-      tab
-    }
-    router.push({
-      name: 'edit-edge-firewall',
-      params
-    })
+    changeTab(index)
   }
 
   const verifyTab = ({ edgeFunctionsEnabled }) => {
@@ -122,6 +115,39 @@
   onMounted(() => {
     renderTabCurrentRouter()
   })
+
+  const changeTab = (index) => {
+    verifyTab(edgeFirewall.value)
+    const tab = getTabFromValue(index)
+    activeTab.value = index
+    const params = {
+      id: edgeFirewallId.value,
+      tab
+    }
+    router.push({
+      name: 'edit-edge-firewall',
+      params
+    })
+  }
+
+  const visibleOnSaved = ref(false)
+
+  provide('unsaved', {
+    changeTab,
+    tabHasUpdate,
+    formHasUpdated,
+    visibleOnSaved
+  })
+
+  watch(activeTab, (newValue, oldValue) => {
+    if (visibleOnSaved.value) {
+      return
+    } else {
+      tabHasUpdate.oldTab = oldValue
+      tabHasUpdate.nextTab = newValue
+      tabHasUpdate.updated = Math.random()
+    }
+  })
 </script>
 
 <template>
@@ -143,6 +169,7 @@
             :edgeFirewall="edgeFirewall"
             :loadDomains="props.listDomainsService"
             :updatedRedirect="edgeFirewallServices.updatedRedirect"
+            :isTab="true"
             @updatedFirewall="updatedFirewall"
           />
         </TabPanel>
diff --git a/src/views/EdgeFirewallFunctions/Drawer/index.vue b/src/views/EdgeFirewallFunctions/Drawer/index.vue
index 8c8b8ade2..a198d3623 100644
--- a/src/views/EdgeFirewallFunctions/Drawer/index.vue
+++ b/src/views/EdgeFirewallFunctions/Drawer/index.vue
@@ -35,7 +35,7 @@
   import { ref, onMounted, computed } from 'vue'
   import * as yup from 'yup'
   import CreateDrawerBlock from '@templates/create-drawer-block'
-  import FormFieldsDrawerFunction from '@/views/EdgeApplicationsFunctions/FormFields/FormFieldsEdgeApplicationsFunctions'
+  import FormFieldsDrawerFunction from '@/views/EdgeFirewallFunctions/FormFields/FormFieldsEdgeApplicationsFunctions'
   import EditDrawerBlock from '@templates/edit-drawer-block'
   import { refDebounced } from '@vueuse/core'
 
diff --git a/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue b/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue
index fdf48ff80..703e04545 100644
--- a/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue
+++ b/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue
@@ -1,12 +1,12 @@
 <script setup>
   import FormHorizontal from '@/templates/create-form-block/form-horizontal'
-  import FieldText from '@/templates/form-fields-inputs/fieldText.vue'
+  import FieldDropdown from '@/templates/form-fields-inputs/fieldDropdown.vue'
   import FieldNumber from '@/templates/form-fields-inputs/fieldNumber.vue'
   import FieldSwitch from '@/templates/form-fields-inputs/fieldSwitch'
-  import FieldDropdown from '@/templates/form-fields-inputs/fieldDropdown.vue'
+  import FieldText from '@/templates/form-fields-inputs/fieldText.vue'
+  import PrimeButton from 'primevue/button'
   import Divider from 'primevue/divider'
   import PrimeMenu from 'primevue/menu'
-  import PrimeButton from 'primevue/button'
   import { useFieldArray } from 'vee-validate'
   import { computed, ref } from 'vue'
 
@@ -78,7 +78,6 @@
           { label: 'does not match', value: 'does_not_match' }
         ]
       case 'request_args':
-      case 'request_uri':
         return [
           { label: 'is equal', value: 'is_equal' },
           { label: 'is not equal', value: 'is_not_equal' },
@@ -87,6 +86,15 @@
           { label: 'exists', value: 'exists' },
           { label: 'does not exist', value: 'does_not_exist' }
         ]
+      case 'request_uri':
+        return [
+          { label: 'is equal', value: 'is_equal' },
+          { label: 'is not equal', value: 'is_not_equal' },
+          { label: 'starts with', value: 'starts_with' },
+          { label: 'does not start with', value: 'does_not_starts_with' },
+          { label: 'matches', value: 'matches' },
+          { label: 'does not match', value: 'does_not_match' }
+        ]
       default:
         break
     }
diff --git a/src/views/EdgeNode/TabsView.vue b/src/views/EdgeNode/TabsView.vue
index e69f7f4c2..c144d9c60 100644
--- a/src/views/EdgeNode/TabsView.vue
+++ b/src/views/EdgeNode/TabsView.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import { ref } from 'vue'
+  import { ref, provide, watch, reactive } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
   import ContentBlock from '@/templates/content-block'
   import PageHeadingBlock from '@/templates/page-heading-block'
@@ -27,14 +27,28 @@
   const activeTab = ref(0)
   const edgeNodeId = ref(route.params.id)
 
+  const tabHasUpdate = reactive({ oldTab: null, nextTab: 0, updated: true })
+  const formHasUpdated = ref(false)
+
+  const defaultTabs = {
+    main_settings: 0,
+    services: 1
+  }
+
+  const mapTabs = ref({ ...defaultTabs })
+
   const renderTabCurrentRouter = () => {
     const { services } = route.params
     activeTab.value = services ? 1 : 0
   }
 
   const changeRouteByClickingOnTab = (event) => {
+    changeTab(event.index)
+  }
+
+  const changeTab = (index) => {
     const { id } = route.params
-    const isServicesTab = event.index === 1
+    const isServicesTab = index === 1
     activeTab.value = isServicesTab ? 1 : 0
     const params = {
       id,
@@ -46,6 +60,25 @@
     })
   }
 
+  const visibleOnSaved = ref(false)
+
+  provide('unsaved', {
+    changeTab,
+    tabHasUpdate,
+    formHasUpdated,
+    visibleOnSaved
+  })
+
+  watch(activeTab, (newValue, oldValue) => {
+    if (visibleOnSaved.value) {
+      return
+    } else {
+      tabHasUpdate.oldTab = oldValue
+      tabHasUpdate.nextTab = newValue
+      tabHasUpdate.updated = Math.random()
+    }
+  })
+
   renderTabCurrentRouter()
 </script>
 
@@ -62,16 +95,18 @@
       >
         <TabPanel header="Main Settings">
           <EditView
+            v-if="mapTabs.main_settings === activeTab"
             :hiddenActionBar="!activeTab"
             :listGroupsEdgeNodeService="props.listGroupsEdgeNodeService"
             :loadEdgeNodeService="props.loadEdgeNodeService"
             :editEdgeNodeService="props.editEdgeNodeService"
             :updatedRedirect="props.updatedRedirect"
+            :isTab="true"
           />
         </TabPanel>
         <TabPanel header="Services">
           <ListViewServices
-            v-if="activeTab"
+          v-if="mapTabs.services === activeTab"
             :edgeNodeId="edgeNodeId"
             :createServiceEdgeNodeService="props.createServiceEdgeNodeService"
             :editServiceEdgeNodeService="props.editServiceEdgeNodeService"
diff --git a/src/views/EdgeServices/TabsView.vue b/src/views/EdgeServices/TabsView.vue
index eb5ef5196..9829f8d2e 100644
--- a/src/views/EdgeServices/TabsView.vue
+++ b/src/views/EdgeServices/TabsView.vue
@@ -5,7 +5,7 @@
   import EditView from '@/views/EdgeServices/EditView'
   import ContentBlock from '@/templates/content-block'
   import { useRoute, useRouter } from 'vue-router'
-  import { ref } from 'vue'
+  import { ref, watch, provide, reactive } from 'vue'
   import ListViewTabResources from '@/views/EdgeServices/ListViewTabResources'
   defineOptions({ name: 'tabs-edge-service' })
 
@@ -26,14 +26,28 @@
   const activeTab = ref(0)
   const edgeServiceId = ref(route.params.id)
 
+  const tabHasUpdate = reactive({ oldTab: null, nextTab: 0, updated: true })
+  const formHasUpdated = ref(false)
+
+  const defaultTabs = {
+    main_settings: 0,
+    resources: 1
+  }
+
+  const mapTabs = ref({ ...defaultTabs })
+
   const renderTabCurrentRouter = () => {
     const { resources } = route.params
     activeTab.value = resources ? 1 : 0
   }
 
   const changeRouteByClickingOnTab = (event) => {
+    changeTab(event.index)
+  }
+
+  const changeTab = (index) => {
     const { id } = route.params
-    const isResourcesTab = event.index === 1
+    const isResourcesTab = index === 1
     activeTab.value = isResourcesTab ? 1 : 0
     const params = {
       id,
@@ -45,6 +59,25 @@
     })
   }
 
+  const visibleOnSaved = ref(false)
+
+  provide('unsaved', {
+    changeTab,
+    tabHasUpdate,
+    formHasUpdated,
+    visibleOnSaved
+  })
+
+  watch(activeTab, (newValue, oldValue) => {
+    if (visibleOnSaved.value) {
+      return
+    } else {
+      tabHasUpdate.oldTab = oldValue
+      tabHasUpdate.nextTab = newValue
+      tabHasUpdate.updated = Math.random()
+    }
+  })
+
   renderTabCurrentRouter()
 </script>
 
@@ -61,15 +94,17 @@
       >
         <TabPanel header="Main Settings">
           <EditView
+            v-if="mapTabs.main_settings === activeTab"
             :hiddenActionBar="!activeTab"
             :loadEdgeService="props.loadEdgeService"
             :editEdgeService="props.editEdgeService"
             :updatedRedirect="props.updatedRedirect"
+            :isTab="true"
           />
         </TabPanel>
         <TabPanel header="Resources">
           <ListViewTabResources
-            v-if="activeTab"
+            v-if="mapTabs.resources === activeTab"
             :edgeServiceId="edgeServiceId"
             :createResourcesServices="props.createResourcesServices"
             :editResourcesServices="props.editResourcesServices"
diff --git a/src/views/Home/HomeView.vue b/src/views/Home/HomeView.vue
index e7251703e..cb9918b52 100644
--- a/src/views/Home/HomeView.vue
+++ b/src/views/Home/HomeView.vue
@@ -209,6 +209,7 @@
   import { useCreateModalStore } from '@/stores/create-modal'
   import { mapState } from 'pinia'
   import { useAccountStore } from '@/stores/account'
+  import { getEnvironmentFromUrl } from '@/helpers'
 
   export default {
     name: 'home-view',
@@ -266,8 +267,9 @@
         this.$router.push({ name: 'list-edge-applications' })
       },
       navigateToPayment() {
-        let billingLink = 'https://manager.azion.com/billing-subscriptions/payment-methods'
-        if (import.meta.env.DEV) {
+        const environment = getEnvironmentFromUrl(window.location.href)
+        let billingLink = 'https://manager.azion.com/billing-subscriptions/bills'
+        if (environment === 'stage') {
           billingLink = 'https://stage-manager.azion.com/billing-subscriptions/bills'
         }
         window.open(billingLink, '_blank')
diff --git a/src/views/NewPassword/NewPasswordView.vue b/src/views/NewPassword/NewPasswordView.vue
index 4c1a1835a..022ffd1a9 100644
--- a/src/views/NewPassword/NewPasswordView.vue
+++ b/src/views/NewPassword/NewPasswordView.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="min-h-[calc(100vh-60px-56px)] sm:py-20 pt-4 pb-8 px-3">
-    <ResetPassword :resetPasswordService="resetPasswordService"></ResetPassword>
+    <ResetPassword
+      :resetPasswordService="resetPasswordService"
+      :passwordSettingService="passwordSettingService"
+    />
   </div>
 </template>
 
@@ -10,6 +13,10 @@
     resetPasswordService: {
       type: Function,
       required: true
+    },
+    passwordSettingService: {
+      type: Function,
+      required: true
     }
   })
 </script>
diff --git a/src/views/WafRules/FormFields/FormFieldsWafRules.vue b/src/views/WafRules/FormFields/FormFieldsWafRules.vue
index b25c3a00d..f59f411ef 100644
--- a/src/views/WafRules/FormFields/FormFieldsWafRules.vue
+++ b/src/views/WafRules/FormFields/FormFieldsWafRules.vue
@@ -67,7 +67,7 @@
   >
     <template #inputs>
       <div class="flex flex-col gap-2">
-        <label class="text-color text-base font-medium">Threat Type Configuration</label>
+        <label class="text-color text-sm font-medium">Threat Type Configuration</label>
         <div class="flex flex-col gap-3">
           <Card
             :pt="{
diff --git a/src/views/WafRules/TabsView.vue b/src/views/WafRules/TabsView.vue
index 0afa04c8a..ba67682b2 100644
--- a/src/views/WafRules/TabsView.vue
+++ b/src/views/WafRules/TabsView.vue
@@ -8,7 +8,7 @@
   import TabView from 'primevue/tabview'
   import { useToast } from 'primevue/usetoast'
 
-  import { ref } from 'vue'
+  import { ref, provide, reactive, watch } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   defineOptions({ name: 'tabs-waf-rules' })
@@ -32,6 +32,9 @@
   const wafRuleId = ref(route.params.id)
   const waf = ref()
 
+  const tabHasUpdate = reactive({ oldTab: null, nextTab: 0, updated: true })
+  const formHasUpdated = ref(false)
+
   const getWafDat = async () => {
     try {
       return await props.wafServices.loadWafRulesService({ id: wafRuleId.value })
@@ -52,6 +55,10 @@
   }
 
   const changeRouteByClickingOnTab = ({ index = 0 }) => {
+    changeTab(index)
+  }
+
+  const changeTab = (index) => {
     const tab = getTabFromValue(index)
     activeTab.value = index
     const params = {
@@ -80,6 +87,25 @@
     changeRouteByClickingOnTab({ index: activeTabIndexByRoute })
   }
 
+  const visibleOnSaved = ref(false)
+
+  provide('unsaved', {
+    changeTab,
+    tabHasUpdate,
+    formHasUpdated,
+    visibleOnSaved
+  })
+
+  watch(activeTab, (newValue, oldValue) => {
+    if (visibleOnSaved.value) {
+      return
+    } else {
+      tabHasUpdate.oldTab = oldValue
+      tabHasUpdate.nextTab = newValue
+      tabHasUpdate.updated = Math.random()
+    }
+  })
+
   renderTabCurrentRouter()
 </script>
 
@@ -102,6 +128,7 @@
             :waf="waf"
             :showActionBar="activeTab === mapTabs.mainSettings"
             @handleWafRulesUpdated="updateWafRulesValue"
+            :isTab="true"
           />
         </TabPanel>
         <TabPanel header="Tuning">
diff --git a/yarn.lock b/yarn.lock
index 1fbdf449f..19f79946e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -700,6 +700,11 @@
   resolved "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz"
   integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
 
+"@feedback-fish/vue@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@feedback-fish/vue/-/vue-1.0.1.tgz#27ab8b04591dcd347b35411ed03616e7e833ad76"
+  integrity sha512-j50djPdr8pUuiQDSgzSpSZGFHcGBYL0pMvipuRsMjN7/tm57mE477N4TRRFvsU09F1mvOlmUGcVm124j7e/3IA==
+
 "@guolao/vue-monaco-editor@^1.3.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@guolao/vue-monaco-editor/-/vue-monaco-editor-1.3.0.tgz"