diff --git a/www/wot.php b/www/wot.php
index d8c8af8..a2952ba 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -33,12 +33,14 @@
 		$id = $oldid;
 	}
 
-	if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6) && $_SESSION['profile']['points'] < 100)
+	if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6))
 	{
-		showheader(_("My CAcert.org Account!"));
-		echo "<p>"._("You don't have access to view these pages.")."</p>";
-		showfooter();
-		exit;
+		if (!is_assurer($_SESSION['profile']['id'])) {
+			showheader(_("My CAcert.org Account!"));
+			echo "<p>".get_assurer_reason($_SESSION['profile']['id'])."</p>";
+			showfooter();
+			exit;
+		}
 	}
 
 	if($oldid == 6 && intval($_SESSION['_config']['notarise']['id']) <= 0)
@@ -295,6 +297,8 @@
 			$query .= ",\n`method`='Trusted Third Parties'";
 		}
 		mysql_query($query);
+		fix_assurer_flag($_SESSION['_config']['notarise']['id']);
+		
 		if($_SESSION['profile']['points'] < 150)
 		{
 			$addpoints = 0;
@@ -310,6 +314,7 @@
 							`method`='Administrative Increase',
 							`when`=NOW()";
 			mysql_query($query);
+			// No need to fix_assurer_flag here, this should only happen for assurers...
 			$_SESSION['profile']['points'] += $addpoints;
 		}