diff --git a/apps/proxy-auth/src/app/app.component.ts b/apps/proxy-auth/src/app/app.component.ts
index 916668d9..c1ef93c6 100644
--- a/apps/proxy-auth/src/app/app.component.ts
+++ b/apps/proxy-auth/src/app/app.component.ts
@@ -26,13 +26,13 @@ export class AppComponent extends BaseComponent implements OnInit, OnDestroy {
     public initOtpProvider() {
         if (!environment.production) {
             const sendOTPConfig = {
-                // referenceId: '4512365m176216342869087ae458e09',
-                // type: 'authorization',
+                referenceId: '4512365m176216342869087ae458e09',
+                type: 'authorization',
                 // loginRedirectUrl: 'https://www.google.com',
                 // showCompanyDetails: false,
-                authToken:
-                    'clV0YUt4UURVbzJYZTRwMHdBNkZ6QjZoay9qMmRRcjZhMGVXMGtCT1ZtdGNaelFxMmlNaGdNcEJuRy9UWmFSZHQvMHc0YnJYUHExakh5NDNGVjZMOEdXVmg3OG82R094Yk5tdE9XckxjUTV1dlNzUERXRWxaOWIwWm5JRmlMVHl5UmpZUHVDK2piOURJUi9IdytncFZBRWc5QnRyRDRVeUFOZlBCY1FST0FOZStISUVtK055VWNxaGduZWpGeUZxVWxYWjd6YXI2YTF0aGxHZTNka1BlQT09',
-                type: 'user-management',
+                // authToken:
+                //     'clV0YUt4UURVbzJYZTRwMHdBNkZ6QjZoay9qMmRRcjZhMGVXMGtCT1ZtdGNaelFxMmlNaGdNcEJuRy9UWmFSZHQvMHc0YnJYUHExakh5NDNGVjZMOEdXVmg3OG82R094Yk5tdE9XckxjUTV1dlNzUERXRWxaOWIwWm5JRmlMVHl5UmpZUHVDK2piOURJUi9IdytncFZBRWc5QnRyRDRVeUFOZlBCY1FST0FOZStISUVtK055VWNxaGduZWpGeUZxVWxYWjd6YXI2YTF0aGxHZTNka1BlQT09',
+                // type: 'user-management',
                 exclude_role_ids: [2],
                 include_role_ids: [1],
                 theme: 'light',
diff --git a/apps/proxy-auth/src/app/element.module.ts b/apps/proxy-auth/src/app/element.module.ts
index fd28d85b..4ab897fa 100644
--- a/apps/proxy-auth/src/app/element.module.ts
+++ b/apps/proxy-auth/src/app/element.module.ts
@@ -65,7 +65,9 @@ window['initVerification'] = (config: any) => {
             } else if (document.getElementById('userProxyContainer')) {
                 document.getElementById('userProxyContainer').append(sendOtpElement);
             } else {
-                document.getElementsByTagName('body')[0].append(sendOtpElement);
+                if (config?.type !== 'user-management') {
+                    document.getElementsByTagName('body')[0].append(sendOtpElement);
+                }
             }
 
             window['libLoaded'] = true;
diff --git a/apps/proxy/src/app/features/create-feature/create-feature.component.ts b/apps/proxy/src/app/features/create-feature/create-feature.component.ts
index 2ef5502f..95bb7b8f 100644
--- a/apps/proxy/src/app/features/create-feature/create-feature.component.ts
+++ b/apps/proxy/src/app/features/create-feature/create-feature.component.ts
@@ -629,8 +629,9 @@ export class CreateFeatureComponent extends BaseComponent implements OnDestroy,
 
     private getServicePayload(selectedMethod: IMethod): IMethodService[] {
         const services = [];
+
         this.featureForm.controls.serviceDetails.controls.forEach((formGroup, index) => {
-            if (formGroup.dirty && formGroup.value.is_enable) {
+            if (formGroup.dirty && (formGroup.value.is_enable || this.isEditMode)) {
                 const service = selectedMethod.method_services[index];
                 const formData = formGroup.value;
                 this.setFormDataInPayload(service?.requirements, formData.requirements, index);