diff --git a/pkg/template/pages/login.html b/pkg/template/pages/login.html
index 4967f119..2fdcc7a3 100644
--- a/pkg/template/pages/login.html
+++ b/pkg/template/pages/login.html
@@ -10,7 +10,7 @@
 		<input type="submit" value="Sign in" />
 	</div>
 	<div>
-        {{ if .Settings }}
+        {{ if .Settings.OpenInvitations }}
         <a href="/signup">request invitation</a> | <a href="/forgot">forgot password</a>
         {{ else }}
 		<a href="/forgot">forgot password</a>
diff --git a/pkg/template/template.go b/pkg/template/template.go
index d5ff5d4c..61ecbe11 100644
--- a/pkg/template/template.go
+++ b/pkg/template/template.go
@@ -104,7 +104,7 @@ func init() {
 		// HACK: choose which base template to use FOR THE RECORD I
 		// don't really like this, but it works for now.
 		var baseTemplate = base
-		if i < 7 {
+		if i < 8 {
 			baseTemplate = form
 		}