diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py
index d8ae6b5..ed24e96 100644
--- a/apiserver/apiserver/api/views.py
+++ b/apiserver/apiserver/api/views.py
@@ -379,11 +379,11 @@ class LockoutViewSet(viewsets.ViewSet, List):
             authorization['id'] = member.id
             authorization['name'] = member.first_name + ' ' + member.last_name
             authorization['common'] = bool(member.orientation_date or member.vetted_date)
-            authorization['lathe'] = bool(member.lathe_cert_date)
-            authorization['mill'] = bool(member.mill_cert_date)
-            authorization['wood'] = bool(member.wood_cert_date)
-            authorization['wood2'] = bool(member.wood2_cert_date)
-            authorization['cnc'] = bool(member.cnc_cert_date)
+            authorization['lathe'] = bool(member.lathe_cert_date) and authorization['common']
+            authorization['mill'] = bool(member.mill_cert_date) and authorization['common']
+            authorization['wood'] = bool(member.wood_cert_date) and authorization['common']
+            authorization['wood2'] = bool(member.wood2_cert_date) and authorization['common']
+            authorization['cnc'] = bool(member.cnc_cert_date) and authorization['common']
 
             active_member_cards[card.card_number] = authorization