diff --git a/components/EditableListItem.tsx b/components/EditableListItem.tsx
index 2d79acf4..ce8239d8 100644
--- a/components/EditableListItem.tsx
+++ b/components/EditableListItem.tsx
@@ -8,14 +8,24 @@ import { useTranslation } from 'react-i18next';
 export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
   const { t } = useTranslation('common');
   const [isEditing, setIsEditing] = useState(false);
-  const [newValue, setNewValue] = useState(props.value);
+  const [items, setItems] = useState(props.items);
   const [overlayOpened, setOverlayOpened] = useState(true);
 
   useEffect(() => {
-    if (props.credentialRegistryResponse === 'success') {
+    if (props.response === 'success') {
       closePopup();
     }
-  }, [props.credentialRegistryResponse]);
+  }, [props.response]);
+
+  function updateItems(label: string, value: string) {
+    const updatedItems = items.map((item) => {
+      if (item.label === label) {
+        return { ...item, value: value };
+      }
+      return item;
+    });
+    setItems(updatedItems);
+  }
 
   return (
     <ListItem bottomDivider topDivider onPress={() => setIsEditing(true)}>
@@ -29,10 +39,10 @@ export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
       <ListItem.Content>
         <ListItem.Title>
           <Text weight="semibold" color={Theme.Colors.profileLabel}>
-            {props.label}
+            {props.title}
           </Text>
         </ListItem.Title>
-        <Text color={Theme.Colors.profileValue}>{props.value}</Text>
+        <Text color={Theme.Colors.profileValue}>{props.content}</Text>
       </ListItem.Content>
       <Icon
         name="chevron-right"
@@ -44,22 +54,28 @@ export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
         isVisible={isEditing}
         onBackdropPress={dismiss}>
         <Column width={Dimensions.get('screen').width * 0.8}>
-          <Text>{t('editLabel', { label: props.label })}</Text>
-          <Input
-            autoFocus
-            value={newValue}
-            onChangeText={setNewValue}
-            selectionColor={Theme.Colors.Cursor}
-            inputStyle={{
-              textAlign: I18nManager.isRTL ? 'right' : 'left',
-            }}
-          />
-          {props.credentialRegistryResponse === 'error' && (
-            <Text style={Theme.TextStyles.error}>{props.errorMessage}</Text>
-          )}
-          {props.credentialRegistryResponse === 'success' &&
-            overlayOpened &&
-            closePopup()}
+          {props.items.map((item: ListItemProps, index) => {
+            return (
+              <React.Fragment key={index}>
+                <Text>{t('editLabel', { label: item.label })}</Text>
+                <Input
+                  autoFocus
+                  value={items[index].value}
+                  onChangeText={(value) => updateItems(item.label, value)}
+                  selectionColor={Theme.Colors.Cursor}
+                  inputStyle={{
+                    textAlign: I18nManager.isRTL ? 'right' : 'left',
+                  }}
+                />
+                {index === 0 && props.response === 'error' && (
+                  <Text style={Theme.TextStyles.error}>
+                    {props.errorMessage}
+                  </Text>
+                )}
+              </React.Fragment>
+            );
+          })}
+          {props.response === 'success' && overlayOpened && closePopup()}
           <Row>
             <Button fill type="clear" title={t('cancel')} onPress={dismiss} />
             <Button
@@ -75,14 +91,13 @@ export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
   );
 
   function edit() {
-    props.onEdit(newValue);
-    if (props.credentialRegistryResponse === undefined) {
+    props.onEdit(items);
+    if (props.response === undefined) {
       setIsEditing(false);
     }
   }
 
   function dismiss() {
-    setNewValue(props.value);
     setIsEditing(false);
     props.onCancel();
   }
@@ -94,14 +109,20 @@ export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
 };
 
 interface EditableListItemProps {
-  label: string;
-  value: string;
+  title: string;
+  content: string;
+  items: ListItemProps[];
   Icon: string;
   IconType?: string;
-  onEdit: (newValue: string) => void;
+  onEdit: (values: ListItemProps[]) => void;
   display?: 'none' | 'flex';
-  credentialRegistryResponse: string;
+  response?: string;
   onCancel: () => void;
   progress?: boolean;
   errorMessage?: string;
 }
+
+interface ListItemProps {
+  label: string;
+  value: string;
+}
diff --git a/locales/en.json b/locales/en.json
index 98a45979..009343f4 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -141,6 +141,7 @@
     "language": "Language",
     "aboutInji": "About Inji",
     "credentialRegistry": "Credential Registry",
+    "esignethosturl": "Esignet Host",
     "errorMessage": "Incorrect URL entered. Please enter a valid URL to proceed.",
     "injiTourGuide": "Inji Tour Guide",
     "logout": "Logout",
diff --git a/machines/app.ts b/machines/app.ts
index 337af37b..5c329a91 100644
--- a/machines/app.ts
+++ b/machines/app.ts
@@ -24,7 +24,9 @@ import { request } from '../shared/request';
 import {
   changeCrendetialRegistry,
   SETTINGS_STORE_KEY,
-  MIMOTO_BASE_URL
+  MIMOTO_BASE_URL,
+  ESIGNET_BASE_URL,
+  changeEsignetUrl,
 } from '../shared/constants';
 
 const model = createModel(
@@ -113,10 +115,16 @@ export const appMachine = model.createMachine(
             },
           },
           credentialRegistry: {
-            entry: ['loadCredentialRegistryHostFromStorage'],
+            entry: [
+              'loadCredentialRegistryHostFromStorage',
+              'loadEsignetHostFromStorage',
+            ],
             on: {
               STORE_RESPONSE: {
-                actions: ['loadCredentialRegistryInConstants'],
+                actions: [
+                  'loadCredentialRegistryInConstants',
+                  'loadEsignetHostFromConstants',
+                ],
                 target: 'info',
               },
             },
@@ -325,6 +333,10 @@ export const appMachine = model.createMachine(
         }
       ),
 
+      loadEsignetHostFromStorage: send(StoreEvents.GET(SETTINGS_STORE_KEY), {
+        to: (context) => context.serviceRefs.store,
+      }),
+
       loadCredentialRegistryInConstants: (_context, event) => {
         changeCrendetialRegistry(
           !event.response?.credentialRegistry
@@ -332,6 +344,14 @@ export const appMachine = model.createMachine(
             : event.response?.credentialRegistry
         );
       },
+
+      loadEsignetHostFromConstants: (_context, event) => {
+        changeEsignetUrl(
+          !event.response?.esignetHostUrl
+            ? ESIGNET_BASE_URL
+            : event.response?.esignetHostUrl
+        );
+      },
     },
 
     services: {
diff --git a/machines/settings.ts b/machines/settings.ts
index cbcfedda..4a0e822b 100644
--- a/machines/settings.ts
+++ b/machines/settings.ts
@@ -7,6 +7,7 @@ import {
   MIMOTO_BASE_URL,
   isIOS,
   SETTINGS_STORE_KEY,
+  ESIGNET_BASE_URL,
 } from '../shared/constants';
 import { VCLabel } from '../types/vc';
 import { StoreEvents } from './store';
@@ -28,6 +29,7 @@ const model = createModel(
     } as VCLabel,
     isBiometricUnlockEnabled: false,
     credentialRegistry: MIMOTO_BASE_URL,
+    esignetHostUrl: ESIGNET_BASE_URL,
     appId: null,
     hasUserShownWithHardwareKeystoreNotExists: false,
     credentialRegistryResponse: '' as string,
@@ -39,9 +41,10 @@ const model = createModel(
       TOGGLE_BIOMETRIC_UNLOCK: (enable: boolean) => ({ enable }),
       STORE_RESPONSE: (response: unknown) => ({ response }),
       CHANGE_LANGUAGE: (language: string) => ({ language }),
-      UPDATE_CREDENTIAL_REGISTRY: (credentialRegistry: string) => ({
+      UPDATE_MIMOTO_HOST: (credentialRegistry: string) => ({
         credentialRegistry,
       }),
+      UPDATE_ESIGNET_HOST: (esignetHostUrl: string) => ({ esignetHostUrl }),
       UPDATE_CREDENTIAL_REGISTRY_RESPONSE: (
         credentialRegistryResponse: string
       ) => ({
@@ -101,10 +104,13 @@ export const settingsMachine = model.createMachine(
           UPDATE_VC_LABEL: {
             actions: ['updateVcLabel', 'storeContext'],
           },
-          UPDATE_CREDENTIAL_REGISTRY: {
+          UPDATE_MIMOTO_HOST: {
             actions: ['resetCredentialRegistry'],
             target: 'resetInjiProps',
           },
+          UPDATE_ESIGNET_HOST: {
+            actions: ['updateEsignetHostUrl', 'storeContext'],
+          },
           CANCEL: {
             actions: ['resetCredentialRegistry'],
           },
@@ -197,6 +203,10 @@ export const settingsMachine = model.createMachine(
         name: (_, event) => event.name,
       }),
 
+      updateEsignetHostUrl: model.assign({
+        esignetHostUrl: (_, event) => event.esignetHostUrl,
+      }),
+
       updateVcLabel: model.assign({
         vcLabel: (_, event) => ({
           singular: event.label,
@@ -294,6 +304,10 @@ export function selectCredentialRegistry(state: State) {
   return state.context.credentialRegistry;
 }
 
+export function selectEsignetHostUrl(state: State) {
+  return state.context.esignetHostUrl;
+}
+
 export function selectCredentialRegistryResponse(state: State) {
   return state.context.credentialRegistryResponse;
 }
diff --git a/screens/Profile/ProfileScreen.tsx b/screens/Profile/ProfileScreen.tsx
index 5068fc44..3290ce35 100644
--- a/screens/Profile/ProfileScreen.tsx
+++ b/screens/Profile/ProfileScreen.tsx
@@ -58,20 +58,32 @@ export const ProfileScreen: React.FC<MainRouteProps> = (props) => {
           title={controller.alertMsg}
         />
         <EditableListItem
-          label={t('name')}
-          value={controller.name}
+          title={t('name')}
+          content={controller.name}
+          items={[
+            {
+              label: t('name'),
+              value: controller.name,
+            },
+          ]}
           onEdit={controller.UPDATE_NAME}
           Icon=""
-          credentialRegistryResponse={''}
+          onCancel={() => {}}
         />
         {/* Intentionally hidden using {display='none'} - Refer mosip/inji/issue#607 */}
         <EditableListItem
-          label={t('vcLabel')}
-          value={controller.vcLabel.singular}
+          title={t('vcLabel')}
+          content={controller.vcLabel.singular}
+          items={[
+            {
+              label: t('vcLabel'),
+              value: controller.vcLabel.singular,
+            },
+          ]}
           onEdit={controller.UPDATE_VC_LABEL}
           Icon="star"
           display="none"
-          credentialRegistryResponse={''}
+          onCancel={() => {}}
         />
         <LanguageSetting />
         <Revoke label={t('revokeLabel')} Icon="rotate-left" />
@@ -125,11 +137,18 @@ export const ProfileScreen: React.FC<MainRouteProps> = (props) => {
         />
         {CREDENTIAL_REGISTRY_EDIT === 'true' && (
           <EditableListItem
-            label={t('credentialRegistry')}
-            value={controller.credentialRegistry}
-            credentialRegistryResponse={controller.credentialRegistryResponse}
+            title={t('credentialRegistry')}
+            content={controller.credentialRegistry}
+            items={[
+              {
+                label: t('credentialRegistry'),
+                value: controller.credentialRegistry,
+              },
+            ]}
+            response={controller.credentialRegistryResponse}
             onEdit={controller.UPDATE_CREDENTIAL_REGISTRY}
             Icon="star"
+            onCancel={() => {}}
           />
         )}
         <ListItem bottomDivider onPress={controller.LOGOUT}>
diff --git a/screens/Profile/ProfileScreenController.ts b/screens/Profile/ProfileScreenController.ts
index 6433ef2d..dc94480f 100644
--- a/screens/Profile/ProfileScreenController.ts
+++ b/screens/Profile/ProfileScreenController.ts
@@ -110,16 +110,14 @@ export function useProfileScreen({ navigation }: MainRouteProps) {
     canUseBiometrics: useSelector(authService, selectCanUseBiometrics),
     useBiometrics,
 
-    UPDATE_NAME: (name: string) =>
-      settingsService.send(SettingsEvents.UPDATE_NAME(name)),
+    UPDATE_NAME: (names) =>
+      settingsService.send(SettingsEvents.UPDATE_NAME(names[0].value)),
 
-    UPDATE_VC_LABEL: (label: string) =>
-      settingsService.send(SettingsEvents.UPDATE_VC_LABEL(label)),
+    UPDATE_VC_LABEL: (labels) =>
+      settingsService.send(SettingsEvents.UPDATE_VC_LABEL(labels[0].value)),
 
-    UPDATE_CREDENTIAL_REGISTRY: (credentialRegistry: string) =>
-      settingsService.send(
-        SettingsEvents.UPDATE_CREDENTIAL_REGISTRY(credentialRegistry)
-      ),
+    UPDATE_CREDENTIAL_REGISTRY: (items) =>
+      settingsService.send(SettingsEvents.UPDATE_MIMOTO_HOST(items[0].value)),
 
     UPDATE_CREDENTIAL_REGISTRY_RESPONSE: (credentialRegistryResponse: string) =>
       settingsService.send(
diff --git a/screens/Settings/SettingScreen.tsx b/screens/Settings/SettingScreen.tsx
index fbca18df..000eb1e2 100644
--- a/screens/Settings/SettingScreen.tsx
+++ b/screens/Settings/SettingScreen.tsx
@@ -54,6 +54,10 @@ export const SettingScreen: React.FC<
   const {t} = useTranslation('SettingScreen');
   const controller = useSettingsScreen(props);
 
+  const updateRegistry = (items) => {
+    controller.UPDATE_CREDENTIAL_REGISTRY(items[0].value, items[1].value);
+  };
+
   return (
     <React.Fragment>
       <Pressable onPress={controller.TOGGLE_SETTINGS}>
@@ -149,13 +153,21 @@ export const SettingScreen: React.FC<
 
             {CREDENTIAL_REGISTRY_EDIT === 'true' && (
               <EditableListItem
-                label={t('credentialRegistry')}
-                value={controller.credentialRegistry}
-                credentialRegistryResponse={
-                  controller.credentialRegistryResponse
-                }
+                title={t('credentialRegistry')}
+                content={controller.credentialRegistry}
+                items={[
+                  {
+                    label: t('credentialRegistry'),
+                    value: controller.credentialRegistry,
+                  },
+                  {
+                    label: t('esignethosturl'),
+                    value: controller.esignetHostUrl,
+                  },
+                ]}
+                response={controller.credentialRegistryResponse}
                 onCancel={controller.CANCEL}
-                onEdit={controller.UPDATE_CREDENTIAL_REGISTRY}
+                onEdit={updateRegistry}
                 Icon="star"
                 errorMessage={t('errorMessage')}
                 progress={controller.isResetInjiProps}
diff --git a/screens/Settings/SettingScreenController.ts b/screens/Settings/SettingScreenController.ts
index 8a806ffd..15b6d86a 100644
--- a/screens/Settings/SettingScreenController.ts
+++ b/screens/Settings/SettingScreenController.ts
@@ -16,6 +16,7 @@ import {
   SettingsEvents,
   selectAppId,
   selectIsResetInjiProps,
+  selectEsignetHostUrl,
 } from '../../machines/settings';
 
 import {
@@ -107,6 +108,7 @@ export function useSettingsScreen(props: RootRouteProps & RequestRouteProps) {
     name: useSelector(settingsService, selectName),
     vcLabel: useSelector(settingsService, selectVcLabel),
     credentialRegistry: useSelector(settingsService, selectCredentialRegistry),
+    esignetHostUrl: useSelector(settingsService, selectEsignetHostUrl),
     credentialRegistryResponse: useSelector(
       settingsService,
       selectCredentialRegistryResponse,
@@ -127,10 +129,15 @@ export function useSettingsScreen(props: RootRouteProps & RequestRouteProps) {
     UPDATE_VC_LABEL: (label: string) =>
       settingsService.send(SettingsEvents.UPDATE_VC_LABEL(label)),
 
-    UPDATE_CREDENTIAL_REGISTRY: (credentialRegistry: string) =>
-      settingsService.send(
-        SettingsEvents.UPDATE_CREDENTIAL_REGISTRY(credentialRegistry),
-      ),
+    UPDATE_CREDENTIAL_REGISTRY: (
+      credentialRegistry: string,
+      esignetHostUrl: string
+    ) => {
+      settingsService.send(SettingsEvents.UPDATE_ESIGNET_HOST(esignetHostUrl)),
+        settingsService.send(
+          SettingsEvents.UPDATE_MIMOTO_HOST(credentialRegistry)
+        );
+    },
 
     UPDATE_CREDENTIAL_REGISTRY_RESPONSE: (credentialRegistryResponse: string) =>
       settingsService.send(
diff --git a/shared/constants.ts b/shared/constants.ts
index e4a44488..caeece69 100644
--- a/shared/constants.ts
+++ b/shared/constants.ts
@@ -8,9 +8,10 @@ import {
 import { Argon2iConfig } from './commonUtil';
 
 export let MIMOTO_BASE_URL = MIMOTO_HOST;
-export const ESIGNET_BASE_URL = ESIGNET_HOST;
+export let ESIGNET_BASE_URL = ESIGNET_HOST;
 
 export const changeCrendetialRegistry = (host) => (MIMOTO_BASE_URL = host);
+export const changeEsignetUrl = (host) => (ESIGNET_BASE_URL = host);
 
 export const MY_VCS_STORE_KEY = 'myVCs';