diff --git a/RIGS/templates/partials/event_detail_buttons.html b/RIGS/templates/partials/event_detail_buttons.html
index d70a0623..e393dab2 100644
--- a/RIGS/templates/partials/event_detail_buttons.html
+++ b/RIGS/templates/partials/event_detail_buttons.html
@@ -51,7 +51,11 @@
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSf-TBOuJZCTYc2L8DWdAaC3_Werq0ulsUs8-6G85I6pA9WVsg/viewform" class="btn btn-danger"><span class="fas fa-file-invoice-dollar"></span> <span class="d-none d-sm-inline">Subhire Insurance Form</span></a>
 
         {% if event.can_check_in %}
-        <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success modal-href {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a>
+            {% if request.user.current_event %}
+            <a href="{% url 'event_checkout' %}" class="btn btn-warning">Check Out</a>
+            {% else %}
+            <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success modal-href"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a>
+            {% endif %}
         {% endif %}
     {% endif %}
 </div>