diff --git a/src/mail.rs b/src/mail.rs
index 04a15b7..039698c 100644
--- a/src/mail.rs
+++ b/src/mail.rs
@@ -16,7 +16,8 @@ pub fn send_notification(
 ) -> Result<()> {
     let mut body = format!(
         "This is your friendly neighbourhood pr-tracker.\n\
-        PR Number {pr_number} titled: \"{pr_title}\" has reached:\n\
+        PR <a href=\"https://github.com/NixOS/nixpkgs/pull/{{ pr_number }}\">#{pr_number}</a>\
+        (\"{pr_title}\") has reached:\n\
         {:#?}\n",
         branches
     );
diff --git a/templates/page.html b/templates/page.html
index 6a09f46..feab091 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -170,7 +170,7 @@
 		<h1>Nixpkgs Pull Request Tracker</h1>
 
 		{%- if subscribed -%}
-		<div class="state-subscribed">You will be notified be by mail when this PR reaches a new ???</div>
+		<div class="state-subscribed">You will be notified be by mail when this PR reaches a new branch</div>
 		{%- endif -%}
 		<form>
 			<label for="pr">PR number: </label>
@@ -179,6 +179,8 @@
                       {{- pr_number -}}
                       {%- else -%}
                       {%- endmatch -%}">
+			{% match pr_number %}
+			{%- when Some with (pr_number) -%}
 			<br>
 			<label for="email">Email: </label>
 			<input id="email" name="email" type="email" value="{%- match email -%}
@@ -187,7 +189,10 @@
                       {%- else -%}
                       {%- endmatch -%}">
 			<br>
+			<button type="submit">Subscribe</button>
+			{%- else -%}
 			<button type="submit">Track</button>
+			{% endmatch %}
 		</form>
 	</header>