diff --git a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
index 0f78400fa..82a1669af 100644
--- a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
+++ b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php
@@ -85,7 +85,7 @@ class HelptopicController extends Controller
             $departments = $department->get();
             $topics = $topic->get();
             $forms = $form->get();
-            $agents = $agent->where('role', '=', 'agent')->get();
+            $agents = $agent->where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get();
             $slas = $sla->get();
             $priority = Ticket_Priority::where('status', '=', 1)->get();
 
@@ -143,7 +143,7 @@ class HelptopicController extends Controller
     public function edit($id, Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, Sla_plan $sla)
     {
         try {
-            $agents = User::where('role', '=', 'agent')->get();
+            $agents = User::where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get();
             $departments = $department->get();
             $topics = $topic->whereId($id)->first();
             $forms = $form->get();
diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 1749ccfb2..7af1ebff8 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -2218,6 +2218,9 @@ class TicketController extends Controller
         if ($count === 1) {
             $user_id = $user->id;
             $ticket = Tickets::where('id', '=', $id)->first();
+            if($user_id === $ticket->user_id) {
+                return 400;
+            }
             $ticket_number = $ticket->ticket_number;
             $ticket->user_id = $user_id;
             $ticket->save();
diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php
index 936663210..f7f610765 100644
--- a/resources/lang/de/lang.php
+++ b/resources/lang/de/lang.php
@@ -1155,5 +1155,7 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 
 ];
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 3582fa87c..81547555c 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1118,7 +1118,7 @@ return [
     'minutes'                                        => ' minutes',
     'in_minutes'                                     => 'In minutes',
     'add_another_owner'                              => 'Add another owner',
-    'user-not-found'                                 => 'User not found. Try again or add a new user.',
+    'user-not-found'                                 => 'User not found or user is inactive. Try again or add a new user.',
     'change-success'                                 => 'Success! owner has been changed for this ticket.',
     'user-exists'                                    => 'User already exists. Try search existing user.',
     'valid-email'                                    => 'Enter a valid email address.',
@@ -1592,4 +1592,6 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 ];
diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php
index 9cc8f4f5a..e3b5c8cf4 100644
--- a/resources/lang/fr/lang.php
+++ b/resources/lang/fr/lang.php
@@ -1563,5 +1563,7 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 
 ];
diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php
index 94275e16a..aa4fc7cc3 100644
--- a/resources/lang/it/lang.php
+++ b/resources/lang/it/lang.php
@@ -1115,4 +1115,6 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 ];
diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php
index 0f8fda029..4ab5bce4c 100644
--- a/resources/lang/nl/lang.php
+++ b/resources/lang/nl/lang.php
@@ -1609,4 +1609,6 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 ];
diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php
index 0121dd46a..79a0ec520 100644
--- a/resources/lang/pt/lang.php
+++ b/resources/lang/pt/lang.php
@@ -1554,5 +1554,7 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 
 ];
diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php
index 206d4a3b8..e6a4ae651 100644
--- a/resources/lang/ru/lang.php
+++ b/resources/lang/ru/lang.php
@@ -1063,4 +1063,6 @@ return [
      'inactive-users'      => 'Inactive users',
      'all-users'           => 'All users',
      'search'              => 'Search...',
+     //update 21-12-2016
+     'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
 ];
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
index 319f40607..46419ceff 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php
@@ -137,7 +137,7 @@ class="active"
                     <div class="col-md-4">
                         <div class="form-group {{ $errors->has('auto_assign') ? 'has-error' : '' }}">
                             {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
-                            {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('first_name','id')->toArray()],null,['class' => 'form-control']) !!}
+                            {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
index a7da41666..36f8707de 100644
--- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php
@@ -135,7 +135,7 @@ class="active"
             <div class="col-md-4">
                 <div class="form-group {{ $errors->has('auto_assign') ? 'has-error' : '' }}">
                     {!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
-                    {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('first_name','id')->toArray()],null,['class' => 'form-control']) !!}
+                    {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
                 </div>
             </div>
         </div>
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 41abed0af..a3508c1ca 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -948,7 +948,7 @@ alert(h+20);
                         <div class="tab-pane active" id="ahah1">
                             <div id="change_alert" class="alert alert-danger alert-dismissable" style="display:none;">
                                 <button id="change_dismiss" type="button" class="close" data-dismiss="alert"  aria-hidden="true">×</button>
-                                <h4><i class="icon fa fa-check"></i>Alert!</h4>
+                                <h4><i class="icon fa fa-exclamation-circle"></i>Alert!</h4>
                                 <div id="message-success42"></div>
                             </div>
                             <div class="modal-body">
@@ -1645,15 +1645,17 @@ alert(h+20);
                     $("#change_loader").show();
             },
             success: function(response) {
-            if (response != 1)
-            {
-            // $("#assign_body").show();
-            var message = "{{Lang::get('lang.user-not-found')}}";
-                    $('#change_alert').show();
-                    $('#message-success42').html(message);
-                    setInterval(function(){$("#change_alert").hide(); }, 5000);
-                    $("#change_body").show();
-                    $("#change_loader").hide();
+            if (response != 1) {
+                // $("#assign_body").show();
+                var message = "{{Lang::get('lang.user-not-found')}}";
+                if (response == 400) {
+                    message = "{{Lang::get('lang.selected-user-is-already-the-owner')}}";
+                }
+                $('#change_alert').show();
+                $('#message-success42').html(message);
+                setInterval(function(){$("#change_alert").hide(); }, 5000);
+                $("#change_body").show();
+                $("#change_loader").hide();
             } else {
             $("#change_body").show();
                     $("#change_loader").hide();