diff --git a/app/Http/Controllers/Admin/helpdesk/PriorityController.php b/app/Http/Controllers/Admin/helpdesk/PriorityController.php
index 94029d1ed..a374e6ce7 100644
--- a/app/Http/Controllers/Admin/helpdesk/PriorityController.php
+++ b/app/Http/Controllers/Admin/helpdesk/PriorityController.php
@@ -94,9 +94,9 @@ class PriorityController extends Controller
                             })
                             ->addColumn('action', function ($model) {
                                 if ($model->is_default > 0) {
-                                    return '<a href='.url('ticket_priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs' disabled='disabled'>Edit</a>&nbsp;<a href=".url('ticket_priority/'.$model->priority_id.'/destroy')." class='btn btn-warning btn-info btn-xs' disabled='disabled' > delete </a>";
+                                    return '<a href='.url('ticket/priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs' disabled='disabled'>Edit</a>&nbsp;<a href=".url('ticket_priority/'.$model->priority_id.'/destroy')." class='btn btn-warning btn-info btn-xs' disabled='disabled' > delete </a>";
                                 } else {
-                                    return '<a href='.url('ticket_priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs'>Edit</a>&nbsp;<a class='btn btn-danger btn-xs' onclick='confirmDelete(".$model->priority_id.")'>Delete </a>";
+                                    return '<a href='.url('ticket/priority/'.$model->priority_id.'/edit')." class='btn btn-info btn-xs'>Edit</a>&nbsp;<a class='btn btn-danger btn-xs' onclick='confirmDelete(".$model->priority_id.")'>Delete </a>";
                                 }
                             })
                             ->searchColumns('priority')
diff --git a/app/Http/routes.php b/app/Http/routes.php
index a240997ab..de8f01b00 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1211,28 +1211,28 @@ Route::group(['middleware' => ['web']], function () {
     /*
      * Ticket_Priority Settings
      */
-    Route::get('ticket_priority', ['as' => 'priority.index', 'uses' => 'Admin\helpdesk\PriorityController@priorityIndex']);
-    Route::post('user_ticket_priority', ['as' => 'user.priority.index', 'uses' => 'Admin\helpdesk\PriorityController@userPriorityIndex']);
+    Route::get('ticket/priority', ['as' => 'priority.index', 'uses' => 'Admin\helpdesk\PriorityController@priorityIndex']);
+    Route::post('user/ticket/priority', ['as' => 'user.priority.index', 'uses' => 'Admin\helpdesk\PriorityController@userPriorityIndex']);
 
     Route::get('get_index', ['as' => 'priority.index1', 'uses' => 'Admin\helpdesk\PriorityController@priorityIndex1']);
     Breadcrumbs::register('priority.index', function ($breadcrumbs) {
         $breadcrumbs->parent('setting');
         $breadcrumbs->push(Lang::get('Ticket Priority'), route('priority.index'));
     });
-    Route::get('ticket_priority/create', ['as' => 'priority.create', 'uses' => 'Admin\helpdesk\PriorityController@priorityCreate']);
+    Route::get('ticket/priority/create', ['as' => 'priority.create', 'uses' => 'Admin\helpdesk\PriorityController@priorityCreate']);
     Breadcrumbs::register('priority.create', function ($breadcrumbs) {
         $breadcrumbs->parent('setting');
         $breadcrumbs->push(Lang::get('Ticket Priority'), route('priority.index'));
         $breadcrumbs->push(Lang::get('lang.create'), route('priority.create'));
     });
     Route::post('ticket_priority/create1', ['as' => 'priority.create1', 'uses' => 'Admin\helpdesk\PriorityController@priorityCreate1']);
-    Route::post('ticket_priority/edit1', ['as' => 'priority.edit1', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit1']);
-    Route::get('ticket_priority/{ticket_priority}/edit', ['as' => 'priority.edit', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit']);
+    Route::post('ticket/priority/edit1', ['as' => 'priority.edit1', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit1']);
+    Route::get('ticket/priority/{ticket_priority}/edit', ['as' => 'priority.edit', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit']);
     Breadcrumbs::register('priority.edit', function ($breadcrumbs) {
         $breadcrumbs->push(Lang::get('Ticket Priority'), route('priority.index'));
         $breadcrumbs->push(Lang::get('Edit'), route('priority.index'));
     });
-    Route::get('ticket_priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']);
+    Route::get('ticket/priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']);
  // user---arindam
  Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin',  'uses' => 'Agent\helpdesk\UserController@changeRoleAdmin']);
     Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent',  'uses' => 'Agent\helpdesk\UserController@changeRoleAgent']);
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 5ae7feccf..02cb3877e 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -376,7 +376,8 @@ return [
     'reload-now'                          => 'Reload now',
     'ticket-lock-inactive'                => 'You have been inactive for a while. Please reload the page.',
     'make-system-default-mail'            => 'Make this email system\'s default email',
-    'thread'                              => 'Thread',
+    'thread' 
+                                 => 'Thread',
     /*
       |--------------------------------------
       |   Access Settings Page
@@ -1489,6 +1490,8 @@ return [
     'priority_successfully_updated' => 'Priority successfully updated',
     'delete_successfully'           => 'Delete successfully',
     'user_priority_status'          => 'User priority status',
+    'current' =>'Current:',
+    'active_user_can_select_the_priority_while_creating_ticket'=>'Active user can select the priority while creating ticket',
 
     /* --------------------------------------------------------------------------------------------
      * Approval Updated
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
index 7c58a7220..f74656881 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
@@ -49,13 +49,17 @@ class="active"
     <div class="box-header with-border">
         <span class="lead border-right">{!! Lang::get('lang.priority') !!}</span>
         <div class="pull-right">
-             <a href="{{route('priority.create')}}" class="btn btn-primary">{{Lang::get('lang.create_ticket_priority')}}</a>
+             <a href="{{route('priority.create')}}" class="btn btn-primary"> {{Lang::get('lang.create_ticket_priority')}}</a>
         </div>
     </div>
+
+
+<!-- <li><a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="Tooltip on right"> sss</a></li> -->
+<a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
     <div class="box-header with-border">
-        <span class="lead border-right">{!! Lang::get('lang.user_priority_status') !!}</span>
+        <span class="lead border-right" >{!! Lang::get('lang.current') !!}{!! Lang::get('lang.user_priority_status') !!}</span>
        
-           
+           </a>
                             <div class="btn-group pull-right" id="toggle_event_editing">
                                 <button type="button"  class="btn {{$user_status->status == '0' ? 'btn-info' : 'btn-default'}} locked_active">Inactive</button>
                                 <button type="button"  class="btn {{$user_status->status == '1' ? 'btn-info' : 'btn-default'}} unlocked_inactive">Active</button>
@@ -65,6 +69,11 @@ class="active"
              <!-- <a href="{{route('priority.create')}}" class="btn btn-primary">{{Lang::get('lang.create_ticket_priority')}}</a> -->
         
     </div>
+
+
+
+
+
     <div class="box-body">
         {!! Datatable::table()
         ->addColumn(
@@ -79,13 +88,16 @@ class="active"
     <div class="box-footer">
     </div>
 </div>
+<script type="text/javascript">
+    $('a').tooltip()
+</script>
 
 <script>
     function confirmDelete(priority_id) {
         var r = confirm('Are you sure?');
         if (r == true) {
             // alert('{!! url("ticket_priority") !!}/' + priority_id + '/destroy');
-            window.location = '{!! url("ticket_priority") !!}/' + priority_id + '/destroy';
+            window.location = '{!! url("ticket/priority") !!}/' + priority_id + '/destroy';
             //    $url('ticket_priority/' . $model->priority_id . '/destroy')
         } else {
             return false;
@@ -112,7 +124,7 @@ class="active"
         $.ajax({
             type: 'post',
             url: '{{route("user.priority.index")}}',
-            data: {user_settings_priority: user_settings_priority},
+            data: {user/settings/priority: user_settings_priority},
             success: function (result) {
                 // with('success', Lang::get('lang.approval_settings-created-successfully'));
                 // alert("Hi, testing");
diff --git a/resources/views/themes/default1/admin/helpdesk/setting.blade.php b/resources/views/themes/default1/admin/helpdesk/setting.blade.php
index 987d00e3e..8eac642a8 100644
--- a/resources/views/themes/default1/admin/helpdesk/setting.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/setting.blade.php
@@ -256,7 +256,7 @@
                  <div class="col-md-2 col-sm-6">
                     <div class="settingiconblue">
                         <div class="settingdivblue">
-                            <a href="{{url('ticket_priority')}}">
+                            <a href="{{url('ticket/priority')}}">
                                 <span class="fa-stack fa-2x">
                                     
                                     <i class="fa fa-asterisk fa-stack-1x"></i>
diff --git a/resources/views/themes/default1/admin/layout/admin.blade.php b/resources/views/themes/default1/admin/layout/admin.blade.php
index eaa6f6a3b..bf176db72 100644
--- a/resources/views/themes/default1/admin/layout/admin.blade.php
+++ b/resources/views/themes/default1/admin/layout/admin.blade.php
@@ -266,7 +266,7 @@
                                 <li @yield('sla')><a href="{{url('sla')}}"><i class="fa fa-clock-o"></i>{!! Lang::get('lang.sla_plans') !!}</a></li>
                                 <li @yield('forms')><a href="{{url('forms')}}"><i class="fa fa-file-text"></i>{!! Lang::get('lang.forms') !!}</a></li>
                                 <li @yield('workflow')><a href="{{url('workflow')}}"><i class="fa fa-sitemap"></i>{!! Lang::get('lang.workflow') !!}</a></li>
-                                <li @yield('priority')><a href="{{url('ticket_priority')}}"><i class="fa fa-asterisk"></i>{!! Lang::get('lang.priority') !!}</a></li>
+                                <li @yield('priority')><a href="{{url('ticket/priority')}}"><i class="fa fa-asterisk"></i>{!! Lang::get('lang.priority') !!}</a></li>
                             </ul>
                         </li>