diff --git a/pkg/template/pages/admin_settings.html b/pkg/template/pages/admin_settings.html
index 3e44de4a8..bc607fa5e 100644
--- a/pkg/template/pages/admin_settings.html
+++ b/pkg/template/pages/admin_settings.html
@@ -33,8 +33,9 @@
 						{{ end }}
 						</select>
 						<input class="form-control form-control-xlarge" type="text" name="Domain" value="{{.Settings.Domain}}" />
-						<label>Open invitations:</label>
-						<input class="form-control form-control-xlarge" type="checkbox" name="OpenInvitations" {{ if .Settings.OpenInvitations }} checked {{ end }} /> enable open invintation requests from users
+						<label class="checkbox">
+							Open invitations <input type="checkbox" name="OpenInvitations" {{ if .Settings.OpenInvitations }} checked {{ end }} />
+						</label>
 					</div>
 					<div class="form-group">
 						<div class="alert">GitHub OAuth Consumer Key and Secret</div>
diff --git a/pkg/template/pages/signup.html b/pkg/template/pages/signup.html
index ef9606cd4..bb4538262 100644
--- a/pkg/template/pages/signup.html
+++ b/pkg/template/pages/signup.html
@@ -4,7 +4,7 @@
 	<h1>Sign up</h1>
 	<form action="/signup" method="POST" role="form">
 		<div>
-			<input type="text" name="email" placeholder="Email address" autocomplete="off" spellcheck="false" class="form-control" />
+			<input type="text" name="email" placeholder="Email address" autocomplete="off" spellcheck="false" class="form-control only-child" />
 		</div>
 		<div>
 			<div class="alert alert-success hide" id="successAlert"></div>
@@ -32,7 +32,7 @@
 					if (this.status == 200) {
 							var msg = "User Invitation was sent successfully";
 							if (this.responseText != "OK") {
-									msg = "Email is not currently enabled.  In order to invite the user, you'll need to provide them the following link:<br><span class='url'>" + this.responseText + "</span>";
+									msg = "Email is not currently enables. Follow the link:<br><a href='" + this.responseText + "'>" + this.responseText + "</a>";
 							}
 							$("#successAlert").html(msg);
 							$("#successAlert").show().removeClass("hide");