diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php
index e9dc8e1f9..c291fb4ee 100644
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -734,7 +734,7 @@ class UserController extends Controller
 
                 return redirect('profile-edit')->with('success1', Lang::get('lang.password_updated_sucessfully'));
             } catch (Exception $e) {
-                return redirect('profile-edit')->with('fails', $e->getMessage());
+                return redirect('profile-edit')->with('fails1', $e->getMessage());
             }
         } else {
             return redirect('profile-edit')->with('fails1', Lang::get('lang.password_was_not_updated_incorrect_old_password'));
diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php
index 98d29e3b0..15de23f29 100644
--- a/app/Http/Controllers/Client/helpdesk/FormController.php
+++ b/app/Http/Controllers/Client/helpdesk/FormController.php
@@ -146,7 +146,7 @@ class FormController extends Controller
      */
     public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code)
     {
-        $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code');
+        $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority');
         $name = $request->input('Name');
         $phone = $request->input('Phone');
         if ($request->input('Email')) {
@@ -179,7 +179,7 @@ class FormController extends Controller
 
          // $priority = $ticket_settings->first()->priority;
          $default_priority = Ticket_Priority::where('is_default', '=', 1)->first();
-        $user_priority = CommonSettings::where('id', '=', 6)->first();
+        $user_priority = CommonSettings::select('status')->where('option_name', '=', 'user_priority')->first();
         if (!($request->input('priority'))) {
             $priority = $default_priority->priority_id;
         } else {
diff --git a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
index 26472aee9..5726c21f8 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
@@ -4,8 +4,39 @@ namespace App\Model\helpdesk\Ticket;
 
 use App\BaseModel;
 
-class Ticket_Form_Data extends BaseModel
-{
+class Ticket_Form_Data extends BaseModel {
+
     protected $table = 'ticket_form_data';
     protected $fillable = ['id', 'ticket_id', 'title', 'content', 'created_at', 'updated_at'];
+
+    public function getFieldKeyLabel() {
+        $value = $this->attributes['title'];
+        $fields = new \App\Model\helpdesk\Form\Fields();
+        $field = $fields->where('name', $value)->first();
+        if ($field) {
+            $value = $field->label;
+        }
+        return $value;
+    }
+    
+    public function isHidden(){
+        $check = false;
+        $value = $this->attributes['title'];
+        $fields = new \App\Model\helpdesk\Form\Fields();
+        $field = $fields->where('name', $value)->first();
+        if ($field && $field->type=='hidden') {
+            $check = true;
+        }
+        return $check;
+    }
+    
+    public function getHidden(){
+        $value = $this->attributes['title'];
+        $fields = new \App\Model\helpdesk\Form\Fields();
+        $field = $fields->where('name', $value)->first();
+        if ($field && $field->type=='hidden') {
+            return $field->label;
+        }
+    }
+
 }
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 30ac3a1bd..21a5b0868 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1550,4 +1550,5 @@ return [
      'activate'                    => 'Activate',
      'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.',
      'assign-ticket'               => 'Assign tickets',
+     'updated-internal-note'       => 'Your note has been added successfully',
 ];
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index 57fe06ee1..8ace9ca26 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -1733,7 +1733,7 @@ alert(h+20);
             {
             $("#refresh1").load("../thread/{{$tickets->id}}   #refresh1");
                     // $("#t4").load("../thread/{{$tickets->id}}   #t4");
-                    var message = "{!! Lang::get('lang.you_have_successfully_replied_to_your_ticket') !!}";
+                    var message = "{!! Lang::get('lang.updated-internal-note') !!}";
                     $("#alert21").show();
                     $('#message-success2').html(message);
                     setInterval(function(){$("#alert21").hide(); }, 4000);
diff --git a/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php b/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
index df6e26c88..994944025 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php
@@ -161,21 +161,21 @@ class="active"
                 <!-- old password -->
                 <div class="form-group has-feedback {{ $errors->has('old_password') ? 'has-error' : '' }}">
                     {!! Form::label('old_password',Lang::get('lang.old_password')) !!} <span class="text-red"> *</span>
-                    {!! Form::password('old_password',['placeholder'=>Lang::get('lang.old_password'),'class' => 'form-control']) !!}
+                    {!! Form::password('old_password',['class' => 'form-control']) !!}
                     {!! $errors->first('old_password', '<spam class="help-block">:message</spam>') !!}
                     <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                 </div>
                 <!-- new password -->
                 <div class="form-group has-feedback {{ $errors->has('new_password') ? 'has-error' : '' }}">
                     {!! Form::label('new_password',Lang::get('lang.new_password')) !!} <span class="text-red"> *</span>
-                    {!! Form::password('new_password',['placeholder'=>Lang::get('lang.new_password'),'class' => 'form-control']) !!}
+                    {!! Form::password('new_password',['class' => 'form-control']) !!}
                     {!! $errors->first('new_password', '<spam class="help-block">:message</spam>') !!}
                     <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                 </div>
                 <!-- confirm password -->
                 <div class="form-group has-feedback {{ $errors->has('confirm_password') ? 'has-error' : '' }}">
                     {!! Form::label('confirm_password',Lang::get('lang.confirm_password')) !!} <span class="text-red"> *</span>
-                    {!! Form::password('confirm_password',['placeholder'=>Lang::get('lang.confirm_password'),'class' => 'form-control']) !!}
+                    {!! Form::password('confirm_password',['class' => 'form-control']) !!}
                     {!! $errors->first('confirm_password', '<spam class="help-block">:message</spam>') !!}
                     <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                 </div>
diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index 66b78f5cb..f6b038195 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -594,4 +594,17 @@
 <?php Event::fire('load-calendar-scripts', array()); ?>
 @yield('FooterInclude')
 </body>
+<script>
+    $(function() {
+      
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
 </html>
\ No newline at end of file
diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php
index 2b183e221..d0de6f461 100644
--- a/resources/views/themes/default1/client/helpdesk/form.blade.php
+++ b/resources/views/themes/default1/client/helpdesk/form.blade.php
@@ -172,7 +172,7 @@ class = "active"
             </div>
             <!-- priority -->
              <?php 
-             $Priority = App\Model\helpdesk\Settings\CommonSettings::where('id','=',6)->first(); 
+             $Priority = App\Model\helpdesk\Settings\CommonSettings::select('status')->where('option_name','=', 'user_priority')->first(); 
              $user_Priority=$Priority->status;
             ?>