diff --git a/src/hss/hss-fd-path.c b/src/hss/hss-fd-path.c
index 58380d0388..76d472005d 100644
--- a/src/hss/hss-fd-path.c
+++ b/src/hss/hss-fd-path.c
@@ -344,6 +344,7 @@ static int hss_s6a_ulr_cb( struct msg **msg, struct avp *avp,
         struct avp *avp_access_restriction_data;
         struct avp *avp_subscriber_status, *avp_network_access_mode;
         struct avp *avp_ambr, *avp_max_bandwidth_ul, *avp_max_bandwidth_dl;
+        struct avp *avp_rau_tau_timer;
         int i;
 
         /* Set the Subscription Data */
@@ -387,20 +388,23 @@ static int hss_s6a_ulr_cb( struct msg **msg, struct avp *avp,
         val.u32 = subscription_data.ambr.uplink;
         ret = fd_msg_avp_setvalue(avp_max_bandwidth_ul, &val);
         ogs_assert(ret == 0);
-        ret = fd_msg_avp_add(avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_ul);
+        ret = fd_msg_avp_add(
+                avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_ul);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_new(s6a_max_bandwidth_dl, 0, &avp_max_bandwidth_dl);
         ogs_assert(ret == 0);
         val.u32 = subscription_data.ambr.downlink;
         ret = fd_msg_avp_setvalue(avp_max_bandwidth_dl, &val);
         ogs_assert(ret == 0);
-        ret = fd_msg_avp_add(avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_dl);
+        ret = fd_msg_avp_add(
+                avp_ambr, MSG_BRW_LAST_CHILD, avp_max_bandwidth_dl);
         ogs_assert(ret == 0);
         ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avp_ambr);
         ogs_assert(ret == 0);
 
         /* Set the Subscribed RAU TAU Timer */
-        ret = fd_msg_avp_new(s6a_subscribed_rau_tau_timer, 0, &avp_rau_tau_timer);
+        ret = fd_msg_avp_new(
+                s6a_subscribed_rau_tau_timer, 0, &avp_rau_tau_timer);
         ogs_assert(ret == 0);
         val.i32 = subscription_data.subscribed_rau_tau_timer * 60; /* seconds */
         ret = fd_msg_avp_setvalue(avp_rau_tau_timer, &val);
diff --git a/src/mme/mme-fd-path.c b/src/mme/mme-fd-path.c
index 7666b60092..9d14b1bdcf 100644
--- a/src/mme/mme-fd-path.c
+++ b/src/mme/mme-fd-path.c
@@ -818,7 +818,8 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
                                 pdn->qos.arp.pre_emption_capability =
                                     hdr->avp_value->i32;
                             } else {
-                                pdn->qos.arp.pre_emption_capability = 1; /* disabled */
+                                pdn->qos.arp.pre_emption_capability =
+                                    PDN_PRE_EMPTION_CAPABILITY_DISABLED;
                             }
 
                             ret = fd_avp_search_avp(avpch4,
@@ -830,7 +831,8 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
                                 pdn->qos.arp.pre_emption_vulnerability =
                                     hdr->avp_value->i32;
                             } else {
-                                pdn->qos.arp.pre_emption_vulnerability = 0; /* enabled */
+                                pdn->qos.arp.pre_emption_vulnerability =
+                                    PDN_PRE_EMPTION_VULNERABILITY_ENABLED;
                             }
 
                         } else {
diff --git a/webui/server/models/subscriber.js b/webui/server/models/subscriber.js
index b58895dec1..ca4b5d94f7 100644
--- a/webui/server/models/subscriber.js
+++ b/webui/server/models/subscriber.js
@@ -50,7 +50,7 @@ const Subscriber = new Schema({
           $type: Number, default: 1 // Capability Disabled
         },
         pre_emption_vulnerability: {
-          $type : Number, default: 1 // Vulnerability Disabled
+          $type : Number, default: 0 // Vulnerability Disabled
         }
       }
     },
@@ -75,7 +75,7 @@ const Subscriber = new Schema({
             $type: Number, default: 1 // Capability Disabled
           },
           pre_emption_vulnerability: {
-            $type : Number, default: 1 // Vulnerability Disabled
+            $type : Number, default: 0 // Vulnerability Disabled
           }
         },
         mbr: {
diff --git a/webui/src/components/Profile/Edit.js b/webui/src/components/Profile/Edit.js
index 7334b0cc76..723c92732f 100644
--- a/webui/src/components/Profile/Edit.js
+++ b/webui/src/components/Profile/Edit.js
@@ -121,7 +121,7 @@ const schema = {
                     "title": "Vulnerability*",
                     "enum": [1, 0],
                     "enumNames": ["Disabled", "Enabled"],
-                    "default": 1,
+                    "default": 0,
                   },
                 }
               }
@@ -234,7 +234,7 @@ const schema = {
                           "maximum": 1,
                           "enum": [1, 0],
                           "enumNames": ["Disabled", "Enabled"],
-                          "default": 1,
+                          "default": 0,
                         },
                       }
                     },
diff --git a/webui/src/components/Subscriber/Edit.js b/webui/src/components/Subscriber/Edit.js
index 95cd15ecec..ca56df429b 100644
--- a/webui/src/components/Subscriber/Edit.js
+++ b/webui/src/components/Subscriber/Edit.js
@@ -127,7 +127,7 @@ const schema = {
                     "title": "Vulnerability*",
                     "enum": [1, 0],
                     "enumNames": ["Disabled", "Enabled"],
-                    "default": 1,
+                    "default": 0,
                   },
                 }
               }
@@ -240,7 +240,7 @@ const schema = {
                           "maximum": 1,
                           "enum": [1, 0],
                           "enumNames": ["Disabled", "Enabled"],
-                          "default": 1,
+                          "default": 0,
                         },
                       }
                     },
diff --git a/webui/src/containers/Profile/Document.js b/webui/src/containers/Profile/Document.js
index 217b12d892..1b474954e9 100644
--- a/webui/src/containers/Profile/Document.js
+++ b/webui/src/containers/Profile/Document.js
@@ -31,7 +31,7 @@ const formData = {
         "arp": {
           "priority_level": 8,
           "pre_emption_capability": 1,
-          "pre_emption_vulnerability": 1
+          "pre_emption_vulnerability": 0
         }
       },
     }
diff --git a/webui/src/containers/Subscriber/Document.js b/webui/src/containers/Subscriber/Document.js
index 2bbb21c952..1ca562ba7b 100644
--- a/webui/src/containers/Subscriber/Document.js
+++ b/webui/src/containers/Subscriber/Document.js
@@ -32,7 +32,7 @@ const formData = {
         "arp": {
           "priority_level": 8,
           "pre_emption_capability": 1,
-          "pre_emption_vulnerability": 1
+          "pre_emption_vulnerability": 0
         }
       },
     }
@@ -260,4 +260,4 @@ Document = connect(
   })
 )(Document);
 
-export default Document;
\ No newline at end of file
+export default Document;