diff --git a/pages/signup.tmpl b/pages/signup.tmpl
index b0b9ffe..bc7f0f8 100644
--- a/pages/signup.tmpl
+++ b/pages/signup.tmpl
@@ -1,180 +1,180 @@
 {{define "head"}}
 <title>Sign up &mdash; {{.SiteName}}</title>
 
 <style type="text/css">
 h2 {
 	font-weight: normal;
 }
 #pricing.content-container div.form-container #payment-form {
 	display: block !important;
 }
 #pricing #signup-form table {
 	max-width: inherit !important;
 	width: 100%;
 }
 #pricing #payment-form table {
 	margin-top: 0 !important;
 	max-width: inherit !important;
 	width: 100%;
 }
 tr.subscription {
 	border-spacing: 0;
 }
 #pricing.content-container tr.subscription button {
 	margin-top: 0 !important;
 	margin-bottom: 0 !important;
 	width: 100%;
 }
 #pricing tr.subscription td {
 	padding: 0 0.5em;
 }
 #pricing table.billing > tbody > tr > td:first-child {
 	vertical-align: middle !important;
 }
 .billing-section {
 	display: none;
 }
 .billing-section.bill-me {
 	display: table-row;
 }
 #btn-create {
 	color: white !important;
 }
 #total-price {
 	padding-left: 0.5em;
 }
 #alias-site.demo {
 	color: #999;
 }
 #alias-site {
 	text-align: left;
 	margin: 0.5em 0;
 }
 form dd {
 	margin: 0;
 }
 </style>
 {{end}}
 {{define "content"}}
 <div id="pricing" class="content-container wide-form">
 
 <div class="row">
 	<div style="margin: 0 auto; max-width: 25em;">
 		<h1>Sign up</h1>
 
 		{{ if .Error }}
 			<p style="font-style: italic">{{.Error}}</p>
 		{{ else }}
 		{{if .Flashes}}<ul class="errors">
 			{{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
 		</ul>{{end}}
 
 		<div id="billing">
 			{{template "oauth-buttons" .}}
 
 			{{if not .DisablePasswordAuth}}
 			<form action="auth/signup" method="POST" id="signup-form" onsubmit="return signup()">
 				<input type="hidden" name="invite_code" value="{{.Invite}}" />
 				<dl class="billing">
 					<label>
 						<dt>Username</dt>
 						<dd>
 							<input type="text" id="alias" name="alias" style="width: 100%; box-sizing: border-box;" tabindex="1" autofocus />
-							{{if .Federation}}<p id="alias-site" class="demo">@<strong>your-username</strong>@{{.FriendlyHost}}</p>{{else}}<p id="alias-site" class="demo">{{.FriendlyHost}}/<strong>your-username</strong></p>{{end}}
+							{{if .Federation}}<p id="alias-site" class="demo">@<strong>your-username</strong>@{{.FriendlyHost}}</p>{{else}}<p id="alias-site" class="demo">{{.FriendlyHost}}{{subdir}}/<strong>your-username</strong></p>{{end}}
 						</dd>
 					</label>
 					<label>
 						<dt>Password</dt>
 						<dd><input type="password" id="password" name="pass" autocomplete="new-password" placeholder="" tabindex="2" style="width: 100%; box-sizing: border-box;" /></dd>
 					</label>
 					<label>
 						<dt>Email (optional)</dt>
 						<dd><input type="email" name="email" id="email" style="letter-spacing: 1px; width: 100%; box-sizing: border-box;" placeholder="me@example.com" tabindex="3" /></dd>
 					</label>
 					<dt>
 						<button id="btn-create" type="submit" style="margin-top: 0">Create blog</button>
 					</dt>
 				</dl>
 			</form>
 			{{end}}
 		</div>
 		{{ end }}
 	</div>
 </div>
 
 <script type="text/javascript" src="js/h.js"></script>
 <script type="text/javascript">
 function signup() {
 	var $pass = document.getElementById('password');
 
 	// Validate input
 	if (!aliasOK) {
 		var $a = $alias;
 		$a.el.className = 'error';
 		$a.el.focus();
 		$a.el.scrollIntoView();
 		return false;
 	}
 
 	if ($pass.value == "") {
 		var $a = $pass;
 		$a.className = 'error';
 		$a.focus();
 		$a.scrollIntoView();
 		return false;
 	}
 
 	var $btn = document.getElementById('btn-create');
 	$btn.disabled = true;
 	$btn.value = 'Creating...';
 	return true;
 }
 
 var $alias = H.getEl('alias');
 var $aliasSite = document.getElementById('alias-site');
 var aliasOK = true;
 var typingTimer;
 var doneTypingInterval = 750;
 var doneTyping = function() {
 	// Check on username
 	var alias = $alias.el.value;
 	if (alias != "") {
 		var params = {
 			username: alias
 		};
 		var http = new XMLHttpRequest();
 		http.open("POST", '/api/alias', true);
 
 		// Send the proper header information along with the request
 		http.setRequestHeader("Content-type", "application/json");
 
 		http.onreadystatechange = function() {
 			if (http.readyState == 4) {
 				data = JSON.parse(http.responseText);
 				if (http.status == 200) {
 					aliasOK = true;
 					$alias.removeClass('error');
 					$aliasSite.className = $aliasSite.className.replace(/(?:^|\s)demo(?!\S)/g, '');
 					$aliasSite.className = $aliasSite.className.replace(/(?:^|\s)error(?!\S)/g, '');
 					$aliasSite.innerHTML = '{{ if .Federation }}@<strong>' + data.data + '</strong>@{{.FriendlyHost}}{{ else }}{{.FriendlyHost}}/<strong>' + data.data + '</strong>/{{ end }}';
 				} else {
 					aliasOK = false;
 					$alias.setClass('error');
 					$aliasSite.className = 'error';
 					$aliasSite.textContent = data.error_msg;
 				}
 			}
 		}
 		http.send(JSON.stringify(params));
 	} else {
 		$aliasSite.className += ' demo';
 		$aliasSite.innerHTML = '{{ if .Federation }}@<strong>your-username</strong>@{{.FriendlyHost}}{{ else }}{{.FriendlyHost}}/<strong>your-username</strong>/{{ end }}';
 	}
 };
 $alias.on('keyup input', function() {
 	clearTimeout(typingTimer);
 	typingTimer = setTimeout(doneTyping, doneTypingInterval);
 });
 </script>
 
 {{end}}
diff --git a/templates/user/invite-help.tmpl b/templates/user/invite-help.tmpl
index 978cfad..58af3d0 100644
--- a/templates/user/invite-help.tmpl
+++ b/templates/user/invite-help.tmpl
@@ -1,32 +1,32 @@
 {{define "invite-help"}}
 {{template "header" .}}
 <style>
   .copy-link {
     width: 100%;
     margin: 1rem 0;
     text-align: center;
     font-size: 1.2em;
     color: #555;
   }
 </style>
 <div class="snug content-container">
 	<h1>Invite to {{.SiteName}}</h1>
 	{{ if .Expired }}
 		<p style="font-style: italic">This invite link is expired.</p>
 	{{ else }}
 		<p>Copy the link below and send it to anyone that you want to join <em>{{ .SiteName }}</em>. You could paste it into an email, instant message, text message, or write it down on paper. Anyone who navigates to this special page will be able to create an account.</p>
-		<input class="copy-link" type="text" name="invite-url" value="{{$.Host}}/invite/{{.Invite.ID}}" onfocus="if (this.select) this.select(); else this.setSelectionRange(0, this.value.length);" readonly />
+		<input class="copy-link" type="text" name="invite-url" value="{{$.Host}}{{subdir}}/invite/{{.Invite.ID}}" onfocus="if (this.select) this.select(); else this.setSelectionRange(0, this.value.length);" readonly />
 		<p>
 			{{ if gt .Invite.MaxUses.Int64 0 }}
 				{{if eq .Invite.MaxUses.Int64 1}}Only <strong>one</strong> user{{else}}Up to <strong>{{.Invite.MaxUses.Int64}}</strong> users{{end}} can sign up with this link.
 				{{if gt .Invite.Uses 0}}So far, <strong>{{.Invite.Uses}}</strong> {{pluralize "person has" "people have" .Invite.Uses}} used it.{{end}}
 				{{if .Invite.Expires}}It expires on <strong>{{.Invite.ExpiresFriendly}}</strong>.{{end}}
 			{{ else }}
 				It can be used as many times as you like{{if .Invite.Expires}} before <strong>{{.Invite.ExpiresFriendly}}</strong>, when it expires{{end}}.
 			{{ end }}
 		</p>
 	{{ end }}
 </div>
 
 {{template "footer" .}}
 {{end}}
diff --git a/templates/user/invite.tmpl b/templates/user/invite.tmpl
index 9e64532..0b204de 100644
--- a/templates/user/invite.tmpl
+++ b/templates/user/invite.tmpl
@@ -1,84 +1,84 @@
 {{define "invite"}}
 {{template "header" .}}
 <style>
 .half {
 	margin-right: 0.5em;
 }
 .half + .half {
 	margin-left: 0.5em;
 	margin-right: 0;
 }
 table.classy {
 	width: 100%;
 }
 table.classy.export a {
 	text-transform: initial;
 }
 table td {
 	font-size: 0.86em;
 }
 </style>
 
 <div class="snug content-container">
 	{{if .Silenced}}
 		{{template "user-silenced"}}
 	{{end}}
 	<h1>Invite people</h1>
 	<p>Invite others to join <em>{{.SiteName}}</em> by generating and sharing invite links below.</p>
 
 	<form style="margin: 2em 0" class="prominent" action="api/me/invites" method="post">
 		<div class="row">
 			<div class="half">
 				<label for="uses">Maximum number of uses:</label>
 				<select id="uses" name="uses" {{if .Silenced}}disabled{{end}}>
 					<option value="0">No limit</option>
 					<option value="1">1 use</option>
 					<option value="5">5 uses</option>
 					<option value="10">10 uses</option>
 					<option value="25">25 uses</option>
 					<option value="50">50 uses</option>
 					<option value="100">100 uses</option>
 				</select>
 			</div>
 			<div class="half">
 				<label for="expires">Expire after:</label>
 				<select id="expires" name="expires" {{if .Silenced}}disabled{{end}}>
 					<option value="0">Never</option>
 					<option value="30">30 minutes</option>
 					<option value="60">1 hour</option>
 					<option value="360">6 hours</option>
 					<option value="720">12 hours</option>
 					<option value="1440">1 day</option>
 					<option value="4320">3 days</option>
 					<option value="10080">1 week</option>
 				</select>
 			</div>
 		</div>
 		<div class="row">
 			<input type="submit" value="Generate" {{if .Silenced}}disabled title="You cannot generate invites while your account is silenced."{{end}} />
 		</div>
 	</form>
 
 	<table class="classy export">
 		<tr>
 			<th>Link</th>
 			<th>Uses</th>
 			<th>Expires</th>
 		</tr>
 		{{range .Invites}}
 		<tr>
-			<td><a href="{{$.Host}}/invite/{{.ID}}">{{$.Host}}/invite/{{.ID}}</a></td>
+			<td><a href="{{$.Host}}{{subdir}}/invite/{{.ID}}">{{$.Host}}{{subdir}}/invite/{{.ID}}</a></td>
 			<td>{{.Uses}}{{if gt .MaxUses.Int64 0}} / {{.MaxUses.Int64}}{{end}}</td>
 			<td>{{ if .Expires }}{{if .Expired}}Expired{{else}}{{.ExpiresFriendly}}{{end}}{{ else }}&infin;{{ end }}</td>
 		</tr>
 		{{else}}
 		<tr>
 			<td colspan="3">No invites generated yet.</td>
 		</tr>
 		{{end}}
 	</table>
 
 </div>
 
 {{template "footer" .}}
 {{end}}