diff --git a/routes/admin.py b/routes/admin.py
index 76ebf35..485c2d8 100644
--- a/routes/admin.py
+++ b/routes/admin.py
@@ -116,23 +116,15 @@ def admin_impersonate_team(tid):
 @admin_required
 def admin_toggle_eligibility(tid):
     team = Team.get(Team.id == tid)
-    team.eligible = not team.eligible
+    if team.eligibility is None:
+        team.eligibility = False
+    else:
+        team.eligibility = not team.eligibility
     team.save()
     flash("Eligibility set to {}".format(team.eligible))
     return redirect(url_for(".admin_show_team", tid=tid))
 
 
-@admin.route("/team/<int:tid>/<csrf>/toggle_eligibility_lock/")
-@csrf_check
-@admin_required
-def admin_toggle_eligibility_lock(tid):
-    team = Team.get(Team.id == tid)
-    team.eligibility_locked = not team.eligibility_locked
-    team.save()
-    flash("Eligibility lock set to {}".format(team.eligibility_locked))
-    return redirect(url_for(".admin_show_team", tid=tid))
-
-
 @admin.route("/team/<int:tid>/adjust_score/", methods=["POST"])
 @admin_required
 def admin_score_adjust(tid):
diff --git a/templates/admin/dashboard.html b/templates/admin/dashboard.html
index e0cd1b6..35c8069 100644
--- a/templates/admin/dashboard.html
+++ b/templates/admin/dashboard.html
@@ -19,7 +19,7 @@
                 <a href="{{ url_for('admin.admin_show_team', tid=team.id) }}">{{ team.name }}</a>
             </td>
             <td>{{ team.affiliation }}</td>
-            <td>{{ "Eligible" if team.eligible else "Ineligible" }}</td>
+            <td>{{ "Eligible" if team.eligible() else "Ineligible" }}</td>
             <td><abbr class="time" title="{{ lastsolvedata[team.id] }}">{{ lastsolvedata[team.id] }}</abbr></td>
             <td>{{ scoredata[team.id] }}</td>
         </tr>
diff --git a/templates/admin/team.html b/templates/admin/team.html
index f75561b..2f64ef6 100644
--- a/templates/admin/team.html
+++ b/templates/admin/team.html
@@ -4,7 +4,6 @@
 <a href="{{ url_for('admin.admin_impersonate_team', tid=team.id, csrf=csrf_token()) }}">Impersonate team</a><br />
 <p>
 This team is <strong>{{ "eligible" if team.eligible else "not eligible" }}</strong> (<a href="{{ url_for('admin.admin_toggle_eligibility', tid=team.id, csrf=csrf_token()) }}">toggle</a>).
-Eligibility is <strong>{{ "locked" if team.eligibility_locked else "unlocked" }}</strong> (<a href="{{ url_for('admin.admin_toggle_eligibility_lock', tid=team.id, csrf=csrf_token()) }}">toggle</a>).
 </p>
 <p>This team's affiliation is <strong>{{ team.affiliation }}</strong></p>
 <h3>Email</h3>