diff --git a/CTFd/templates/teams.html b/CTFd/templates/teams.html
index cd37b9ae..a2f50c84 100644
--- a/CTFd/templates/teams.html
+++ b/CTFd/templates/teams.html
@@ -35,7 +35,11 @@
     <div class="text-center">Page
         <br>
         {% for page in range(1, team_pages + 1) %}
-        <a href="/teams/{{ page }}">{{ page }}</a>
+            {% if curr_page != page %}
+                <a href="/teams/{{ page }}">{{ page }}</a>
+            {% else %}
+                <b>{{page}}</b>
+            {% endif %}
         {% endfor %}
     <a href="">
     </div>
diff --git a/CTFd/views.py b/CTFd/views.py
index 4afbd208..d0be1409 100644
--- a/CTFd/views.py
+++ b/CTFd/views.py
@@ -136,7 +136,7 @@ def teams(page):
     count = db.session.query(db.func.count(Teams.id)).first()[0]
     print(count)
     pages = int(count / results_per_page) + (count % results_per_page > 0)
-    return render_template('teams.html', teams=teams, team_pages=pages)
+    return render_template('teams.html', teams=teams, team_pages=pages, curr_page=page)
 
 @views.route('/team/<teamid>', methods=['GET', 'POST'])
 def team(teamid):