diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index f4c9483..dadce9c 100644
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -423,8 +423,8 @@ class Invoice extends BaseController
                 $params->number = (int)'919677462018';
                 $params->type = "text";
                 $params->message = $message;
-                $params->instance_id = '65C9B978325A2';
-                $params->access_token = '65c715e797d16';
+                $params->instance_id = $_ENV['WAAI_INSTANCE'];
+                $params->access_token = $_ENV['WAAI_TOKEN'];
                 $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params);
           
         } catch (\Exception $e) {
diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php
index 1679c64..73c3d04 100644
--- a/app/Models/NotificationModel.php
+++ b/app/Models/NotificationModel.php
@@ -7,7 +7,7 @@ class NotificationModel extends Model
     protected $table = 'templates';
     protected $primaryKey = 'template_id';
     // protected $allowedFields = ['invoice_id','invoice_number','donor_id','invoice_date','event_id','business_id','created_on','business_id'];
-    protected $allowedFields = ['template_name', 'subject', 'message','mode','crteated_on', 'created_by', 'updated_on',  'updated_by', 'isactive'];
+    protected $allowedFields = ['template_name', 'subject', 'message','mode','crteated_on', 'created_by', 'updated_on',  'updated_by', 'isactive','donor_id'];
 
     public function setCustomTable($tableName)
     {
diff --git a/app/Views/campaign_creation_form.php b/app/Views/campaign_creation_form.php
index 8adf5f5..f2ff8bf 100644
--- a/app/Views/campaign_creation_form.php
+++ b/app/Views/campaign_creation_form.php
@@ -38,13 +38,13 @@
                                 </div>
                             </div>
                             <div class="form-group col-md-8">
-                                <label for="scheduled" class="col-form-label">Scheduled Date/Time<span class="text-danger"></span></label>
+                                <label for="scheduled" class="col-form-label">Scheduled Date/Time<span class="text-danger">*</span></label>
                                 <div class="row">
                                     <div class="col-6">
-                                        <input class="form-control" type="date" name="scheduled_date" id="example-date" value="<?= isset($campaign_details['scheduled_date']) ? $campaign_details['scheduled_date'] : '' ?>">
+                                        <input class="form-control" type="date" name="scheduled_date" id="example-date" value="<?= isset($campaign_details['scheduled_date']) ? $campaign_details['scheduled_date'] : '' ?>" required>
                                     </div>
                                     <div class="col-6">
-                                        <input class="form-control" type="time" name="scheduled_time" id="example-time" value="<?= isset($campaign_details['scheduled_time']) ? $campaign_details['scheduled_time'] : '' ?>">
+                                        <input class="form-control" type="time" name="scheduled_time" id="example-time" value="<?= isset($campaign_details['scheduled_time']) ? $campaign_details['scheduled_time'] : '' ?>" required>
                                     </div>
                                 </div>
                             </div>
diff --git a/app/Views/notifications_form.php b/app/Views/notifications_form.php
index bfb9e91..cfa5e9f 100644
--- a/app/Views/notifications_form.php
+++ b/app/Views/notifications_form.php
@@ -87,9 +87,9 @@
                 <div id="mailFormDiv">
                     <form role="form" class="parsley-examples" method="POST" enctype="multipart/form-data" action="<?= base_url() . "mail_custom_notifications"; ?>" id="myForm2">
                         <div class="form-group row">
-                            <label for="recipient" class="col-4 col-form-label">Recipient Email</label>
+                            <label for="recipient" class="col-4 col-form-label">Recipient Email<span class="text-danger">*</span></label>
                             <div class="col-7">
-                                <input type="email" placeholder="Recipient Email" class="form-control" id="recipient" name="recipient_email" parsley-type="email">
+                                <input type="email" placeholder="Recipient Email" class="form-control" id="recipient" name="recipient_email" parsley-type="email" required>
                             </div>
                         </div>
                         <div class="form-group row">
@@ -105,9 +105,9 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="subject" class="col-4 col-form-label">Subject</label>
+                            <label for="subject" class="col-4 col-form-label">Subject<span class="text-danger">*</span></label>
                             <div class="col-7">
-                                <input type="text" placeholder="Subject" class="form-control" id="subject" name="subject">
+                                <input type="text" placeholder="Subject" class="form-control" id="subject" name="subject" required>
                             </div>
                         </div>
                         <div class="form-group row">
@@ -150,17 +150,17 @@
                         </div>
                         <div id="fields-for-mobile">
                             <div class="form-group row">
-                                <label for="mobile" class="col-4 col-form-label">Mobile Number</label>
+                                <label for="mobile" class="col-4 col-form-label">Mobile Number<span class="text-danger">*</span></label>
                                 <div class="col-7">
                                     <!-- <input type="number" placeholder="Mobile Number" class="form-control" id="mobile" name="mobile"> -->
-                                    <input type="text" class="form-control" id="mobile" name="mobile" placeholder="Mobile Number" data-toggle="input-mask" data-mask-format="0000000000">
+                                    <input type="text" class="form-control" id="mobile" name="mobile" placeholder="Mobile Number" data-toggle="input-mask" data-mask-format="0000000000" required>
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="type" class="col-4 col-form-label">Message Type</label>
+                            <label for="type" class="col-4 col-form-label">Message Type<span class="text-danger">*</span></label>
                             <div class="col-7">
-                                <select class="form-control" id="type" name="type">
+                                <select class="form-control" id="type" name="type" required>
                                     <option value="">Choose your Message Type</option>
                                     <option value="text">Text</option>
                                     <option value="media">Media</option>
@@ -169,16 +169,16 @@
                         </div>
                         <div id="fields-for-mediaurl" style="display: none;">
                             <div class="form-group row">
-                                <label for="media_url" class="col-4 col-form-label">Media Url</label>
+                                <label for="media_url" class="col-4 col-form-label">Media Url<span class="text-danger">*</span></label>
                                 <div class="col-7">
-                                    <input type="text" placeholder="Media URL" class="form-control" id="media_url" name="media_url">
+                                    <input type="text" placeholder="Media URL" class="form-control" id="media_url" name="media_url" required>
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="message" class="col-4 col-form-label">Message</label>
+                            <label for="message" class="col-4 col-form-label">Message<span class="text-danger">*</span></label>
                             <div class="col-7">
-                                <textarea id="message" name="description" class="form-control" rows="5">Hello {USER_NAME},Please,write text here!</textarea>
+                                <textarea id="message" name="description" class="form-control" rows="5" required>Hello {USER_NAME},Please,write text here!</textarea>
                             </div>
                         </div>
                         <div class="form-group text-right m-b-0">
@@ -257,8 +257,10 @@
         // Determine which option is selected and show the corresponding fields
         const selectedOption = dropdown.value;
         if(selectedOption === "media"){
+            $('#media_url').attr('required', 'required');
             fieldsForMediaURL.style.display = "block";
         } else {
+            $('#media_url').removeAttr('required');
             fieldsForMediaURL.style.display = "none";
             document.getElementById("media_url").value = "";
         }