diff --git a/src/components/creation/CreateABHAAddress.jsx b/src/components/creation/CreateABHAAddress.jsx
index 715e87f..fa1d1f0 100644
--- a/src/components/creation/CreateABHAAddress.jsx
+++ b/src/components/creation/CreateABHAAddress.jsx
@@ -1,7 +1,7 @@
 import React, {useState} from "react";
 import './creation.scss';
 import Spinner from "../spinner/spinner";
-import {checkIfABHAAddressExists, createABHAAddress} from "../../api/hipServiceApi";
+import {checkIfABHAAddressExists, createABHAAddress, createDefaultHealthId} from "../../api/hipServiceApi";
 import Footer from "./Footer";
 import {cmSuffixProperty} from "../../api/constants";
 
@@ -35,6 +35,7 @@ const CreateABHAAddress = (props) => {
                             if (response.data === undefined) {
                                 processingError(response);
                             } else {
+                                setNewAbhaAddress(newAbhaAddress.concat(cmSuffix));
                                 props.setABHAAddressCreated(true);
                             }
                         }
@@ -51,6 +52,20 @@ const CreateABHAAddress = (props) => {
         }
     }
 
+    async function createDefault() {
+        setLoader(true);
+        setError('');
+        const response = await createDefaultHealthId();
+        if (response.data !== undefined) {
+            props.setABHAAddressCreated(true);
+            setNewAbhaAddress(response.data.healthId);
+        }
+        else {
+            setError(response.details[0].message || response.message)
+        }
+        setLoader(false);
+    }
+
     function processingError(response){
         if (response.details !== undefined && response.details.length > 0)
             setError(response.details[0].message)
@@ -64,28 +79,32 @@ const CreateABHAAddress = (props) => {
 
     return (
         <div>
-            <div>
-                <div className="abha-address" >
-                    <label htmlFor="abhaAdddress">Enter new ABHA ADDRESS </label>
-                    <div className="abha-adddress-input" >
-                        <div className="new-abha-address-input">
-                            <input type="text" id="abhaAdddress" name="abhaAdddress" value={newAbhaAddress} onChange={OnChangeHandler} />
-                            <span className="abha-address-suffix">{cmSuffix}</span>
-                        </div>
+            <div className="abha-address" >
+                <label htmlFor="abhaAdddress">Enter new ABHA ADDRESS </label>
+                <div className="abha-adddress-input" >
+                    <div className="new-abha-address-input">
+                        <input type="text" id="abhaAdddress" name="abhaAdddress" value={newAbhaAddress} onChange={OnChangeHandler} />
+                        <span className="abha-address-suffix">{cmSuffix}</span>
                     </div>
                 </div>
-                <div className="center" >
-                    <input type="checkbox" id="preferred" checked={isPreferred} className="checkbox" onChange={OnClick}/>
-                    <span className="preferred"> Preferred </span>
-                </div>
-                <p className="message">Click on the check box to make the above abha-address as a default</p>
-                {error !== '' && <h6 className="error">{error}</h6>}
-                {loader && <Spinner />}
-                <div className="center">
-                    <button type="button" className="proceed" onClick={onCreate}>Create</button>
-                </div>
-                <Footer setBack={props.setBack} />
             </div>
+            <div className="center" >
+                <input type="checkbox" id="preferred" checked={isPreferred} className="checkbox" onChange={OnClick}/>
+                <span className="preferred"> Preferred </span>
+            </div>
+            <p className="message">Click on the check box to make the above abha-address as a default</p>
+            {error !== '' && <h6 className="error">{error}</h6>}
+            <div className="center">
+                <button type="button" className="proceed" onClick={onCreate}>Create</button>
+            </div>
+            <div className="alternative-text">
+                OR
+            </div>
+            <div className="create-default-healthId">
+                <button name="default-healthId-btn" type="button" onClick={createDefault}>Create Default ABHA Address</button>
+            </div>
+            {loader && <Spinner />}
+            <Footer setBack={props.setBack} />
         </div>
     );
 }
diff --git a/src/components/creation/LinkABHAAddress.jsx b/src/components/creation/LinkABHAAddress.jsx
index 245f210..39541bb 100644
--- a/src/components/creation/LinkABHAAddress.jsx
+++ b/src/components/creation/LinkABHAAddress.jsx
@@ -3,7 +3,7 @@ import './creation.scss';
 import PatientDetails from "../patient-details/patientDetails";
 import VerifyMobileEmail from "./VerifyMobileEmail";
 import CreateABHAAddress from "./CreateABHAAddress";
-import {cmSuffixProperty, enableLinkABHAAddress} from "../../api/constants";
+import {enableLinkABHAAddress} from "../../api/constants";
 import CheckIdentifierExists from "../Common/CheckIdentifierExists";
 import {fetchGlobalProperty} from "../../api/hipServiceApi";
 
@@ -22,8 +22,6 @@ const LinkABHAAddress = (props) => {
     const [healthNumberAlreadyLinked, setHealthNumberAlreadyLinked] = useState(false);
     let isLinkingEnabled;
     const refEls = useRef({});
-
-    const cmSuffix = localStorage.getItem(cmSuffixProperty)
     
     function onProceed() {
         mapPatient();
@@ -65,7 +63,7 @@ const LinkABHAAddress = (props) => {
 
 
     function mapPatient(){
-        props.mappedPatient.id = abhaAddressCreated ? newAbhaAddress.concat(cmSuffix) : abhaAddress;
+        props.mappedPatient.id = abhaAddressCreated ? newAbhaAddress : abhaAddress;
     }
 
     function gotoLink(){
diff --git a/src/components/creation/creation.scss b/src/components/creation/creation.scss
index dd0888a..c23bc6b 100644
--- a/src/components/creation/creation.scss
+++ b/src/components/creation/creation.scss
@@ -46,6 +46,11 @@
     color: red;
     margin-top: 0px;
   }
+
+  .create-default-healthId {
+    margin-left: 40%;
+    margin-top: 5%
+  }
 }
 
 button {