diff --git a/web/src/components/AsyncLoader.vue b/web/src/components/AsyncLoader.vue
index 393175c..06c5908 100644
--- a/web/src/components/AsyncLoader.vue
+++ b/web/src/components/AsyncLoader.vue
@@ -57,7 +57,7 @@ export default {
     color: #17a2b8;
 }
 
-.async-wrapper.loaded > .loader-wrapper > .loader-ellipsis {
+.async-wrapper.loaded > .loader-wrapper {
     display: none;
 }
 
@@ -130,4 +130,4 @@ export default {
         transform: translate(24px, 0);
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index 39f5a71..560811f 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -18,8 +18,10 @@
                                 <select class="form-control" v-model="ticket.assigned_to">
                                     <option v-for="user in users" :value="user.username">{{ user.username }}</option>
                                 </select>
-                                <button class="form-control btn btn-success" @click="assignTicket(ticket)">
-                                    Assign&nbsp;Ticket
+                                <button class="form-control btn btn-success" 
+										@click="assignTicket(ticket)"
+										:disabled="!ticket.assigned_to">
+									Assign&nbsp;Ticket
                                 </button>
                             </div>
                             <div class="btn-group">
@@ -124,4 +126,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>