diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index 2872185..629ede8 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -20,7 +20,7 @@
                                 </select>
                                 <button class="form-control btn btn-success" 
 										@click="assignTicket(ticket)"
-										:disabled="!selected_assignee && (selected_assignee == ticket.assigned_to)">
+										:disabled="!selected_assignee || (selected_assignee == ticket.assigned_to)">
 									Assign&nbsp;Ticket
                                 </button>
                             </div>
@@ -75,7 +75,7 @@ export default {
     data() {
 		return {
 			selected_state: null,
-			Selected_assignee: null,
+			selected_assignee: null,
             shipping_voucher_type: null,
         }
     },
@@ -83,7 +83,10 @@ export default {
 		ticket(val) {
 			if (this.selected_state == null){
 				this.selected_state = val.state;
-			} 
+			};
+			if(this.selected_assignee == null){
+				this.selected_assignee = val.assigned_to
+			}
 		}
 	},
 	computed: {