diff --git a/myriad/home.py b/myriad/home.py
index feb488a..187ea05 100644
--- a/myriad/home.py
+++ b/myriad/home.py
@@ -12,7 +12,12 @@ bp = Blueprint('home', __name__)
 @bp.route('/')
 def index():
     db = get_db()
-    fronters = db.execute("SELECT * FROM member WHERE front=(?) ORDER BY member_name",(1,)).fetchall()
+
+    if g.user:
+        fronters = db.execute("SELECT * FROM member WHERE front=(?) ORDER BY member_name",(1,)).fetchall()
+    else:
+        fronters = db.execute("SELECT * FROM member WHERE front=(?) AND public=(?) ORDER BY member_name",(1,1)).fetchall()
+    
     homepage = db.execute("SELECT * FROM member WHERE homepage=(?) ORDER BY member_name COLLATE NOCASE",(1,)).fetchall()
 
     latest_start = db.execute("SELECT start_time FROM front_log ORDER BY start_time DESC").fetchone()
diff --git a/myriad/templates/index.html b/myriad/templates/index.html
index 54b5ca6..7050aad 100644
--- a/myriad/templates/index.html
+++ b/myriad/templates/index.html
@@ -6,7 +6,7 @@
 
   <div id="frontbanner" class="heading">
   {% if front_list|length > 0 %}
-    <b>currently fronting: </b> {% for member in front_list %}{% if not g.user and member[9]==0 %}{% else %}<a href="{{ url_for('home.page', mid=member[0]) }}">{{ member[3]|safe }}</a> {% if front_list.index(member) != front_list|length -1 %}&{% endif %}{% endif %} {% endfor %}
+    <b>currently fronting: </b> {% for member in front_list %}{% if member[22] %}<a href="{{ url_for('home.page', mid=member[22]) }}">{{ member[3]|safe }}</a>{%else%}<a href="{{ url_for('home.page', mid=member[0]) }}">{{ member[3]|safe }}</a>{%endif%} {% if front_list.index(member) != front_list|length -1 %}& {% endif %}{% endfor %}
   {% else %}
     <i><sub>There are currently no members listed as fronting</sub></i> 
   {% endif %}