diff --git a/webui/src/main/js/trustLists.js b/webui/src/main/js/trustLists.js
index f4072cd6..d4b5f08f 100644
--- a/webui/src/main/js/trustLists.js
+++ b/webui/src/main/js/trustLists.js
@@ -13,7 +13,11 @@ class Persona {
 	constructor(xmlNode) {
 		this.user = xmlNode.getElementsByTagName("User")[0].childNodes[0].nodeValue
 		this.userB64 = xmlNode.getElementsByTagName("UserB64")[0].childNodes[0].nodeValue
-		this.reason = xmlNode.getElementsByTagName("Reason")[0].childNodes[0].nodeValue
+		try {
+			this.reason = xmlNode.getElementsByTagName("Reason")[0].childNodes[0].nodeValue
+		} catch (ignore) {
+			this.reason = ""
+		}
 		this.status = xmlNode.getElementsByTagName("Status")[0].childNodes[0].nodeValue
 	}
 }
@@ -22,6 +26,18 @@ var lists = new Map()
 var revision = -1
 var currentUser = null
 
+function unsubscribe(user) {
+	var xmlhttp = new XMLHttpRequest()
+	xmlhttp.onreadystatechange = function() {
+		if (this.readyState == 4 && this.status == 200) {
+			refreshLists()
+		}
+	}
+	xmlhttp.open("POST","/MuWire/Trust", true)
+	xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+	xmlhttp.send("action=unsubscribe&persona=" + user)
+}
+
 function updateDiv(name, list) {
 	
 	var html = "<table><thead><tr><th>User</th><th>Reason</th><th>Your Trust</th></tr></thead><tbody>"
@@ -76,6 +92,7 @@ function refreshLists() {
 	var xmlhttp = new XMLHttpRequest()
 	xmlhttp.onreadystatechange = function() {
 		if (this.readyState == 4 && this.status == 200) {
+			lists.clear()
 			var subs = this.responseXML.getElementsByTagName("Subscription")
 			var i
 			for (i = 0; i < subs.length; i++) {
@@ -87,12 +104,12 @@ function refreshLists() {
 			var html = "<table><thead><tr><th>Name</th><th>Trusted</th><th>Distrusted</th><th>Status</th><th>Last Updated</th><th>Unsubscribe</th></tr></thead><tbody>"
 			for (var [user, list] of lists) {
 				html += "<tr>"
-				html += "<td>" + list.user + "</td>"
+				html += "<td>" + "<a href='#' onclick='window.displayList(\"" + list.user + "\");return false;'>" + list.user + "</a></td>"
 				html += "<td>" + list.trusted + "</td>"
 				html += "<td>" + list.distrusted +"</td>"
 				html += "<td>" + list.status + "</td>"
 				html += "<td>" + list.timestamp + "</td>"
-				html += "<td>" + "Unsubscribe" + "</td>"
+				html += "<td>" + "<a href='#' onclick='window.unsubscribe(\"" + list.userB64 + "\");return false;'>Unsubscribe</a></td>"
 				html += "</tr>"
 			}
 			html += "</tbody></table>"
diff --git a/webui/templates/web.xml.template b/webui/templates/web.xml.template
index e7da5496..6dd01754 100644
--- a/webui/templates/web.xml.template
+++ b/webui/templates/web.xml.template
@@ -123,4 +123,9 @@ Mappings without the .jsp suffix
     <url-pattern>/TrustUsers</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+    <servlet-name>com.muwire.webui.TrustLists_jsp</servlet-name>
+    <url-pattern>/TrustLists</url-pattern>
+</servlet-mapping>
+
 </web-app>