diff --git a/advlabdb/templates/assistant_group_experiment_form.html b/advlabdb/templates/assistant_group_experiment_form.html
index 893cfbe..b95fd01 100644
--- a/advlabdb/templates/assistant_group_experiment_form.html
+++ b/advlabdb/templates/assistant_group_experiment_form.html
@@ -108,10 +108,12 @@
                                 {% endif %}
                             </td>
                             <td>
-                                {{ student.uni_email }}
+                                <a href="mailto:{{ student.uni_email }}">{{ student.uni_email }}</a>
                             </td>
                             <td>
-                                {{ student.contact_email }}
+                                {% if student.contact_email is not none %}
+                                    <a href="mailto:{{ student.contact_email }}">{{ student.contact_email }}</a>
+                                {% endif %}
                             </td>
                         </tr>
                     {% endfor %}