diff --git a/lib/unix_dog/Controller/Main.pm b/lib/unix_dog/Controller/Main.pm
index 22fd611..e4e5628 100644
--- a/lib/unix_dog/Controller/Main.pm
+++ b/lib/unix_dog/Controller/Main.pm
@@ -69,11 +69,14 @@ sub user_pages ($self) {
 
         for (@sorted) {
 			my $uid = $_->get_value('uid');
-			my $dir = "/home/$uid/public/www";
-			my $has_page = is_dir_used($dir);
+			my $web_dir = "/home/$uid/public/www";
+            my $gem_dir = "/home/$uid/public/gemini";
+            my $has_web_page = is_dir_used($web_dir);
+            my $has_gem_page = is_dir_used($gem_dir);
             push @{$users}, {
 				username => $uid,
-				has_page => $has_page,
+                has_web_page => $has_web_page,
+                has_gem_page => $has_gem_page,
 			};
         }
         return $users;
diff --git a/templates/main/usersList.html.ep b/templates/main/usersList.html.ep
index 915d3a7..ab713c4 100644
--- a/templates/main/usersList.html.ep
+++ b/templates/main/usersList.html.ep
@@ -5,8 +5,18 @@
     <p>Here's a list of all UNIX.dog users and their webpages:</p>
     <ul>
         % foreach my $user (@{$users}) {
+            <li>
+            ~<%= $user->{username} %>
+            % if ($user->{has_web_page}) {
+                <a href="https://unix.dog/~<%=$user->{username}%>/">web</a>
+            % }
+            % if ($user->{has_gem_page}) {
+                <a href="gemini://unix.dog/~<%=$user->{username}%>/">gemini</a>
+            %}
+            </li>
 			% if ($user->{has_page}) {
-            	<li><a
+            	<li>
+                <a
 				href="https://unix.dog/~<%=$user->{username}%>/">~<%=$user->{username} %></a></li>
 			% } else {
 				<li>~<%= $user->{username} %></li>