diff --git a/templates/login.tpl b/templates/login.tpl
index 0d0258a1734850a3d2f087ffebda86a938a4fe10..28635ad49fc05f8f36f95455cd7b07fc320bdaeb 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -24,10 +24,12 @@ No new email<br />
 
 					<input type="submit" class="button" name="Logout" id="Logout" value="Logout" />
 {else}
-					<label for="session_user">Username</label> <input type="text" class="text" name="session_user" id="session_user" /><br />
-					<label for="session_pass">Password</label> <input type="password" class="text" name="session_pass" id="session_pass" /><br />
+					<input type="text" class="text" name="session_user" id="session_user" placeholder="Username" />
+					<input type="password" class="text" name="session_pass" id="session_pass" placeholder="Password" />
 					<input type="hidden" name="token" value="{$session->token}" />
 					<input type="submit" class="button" name="Login" id="Login" value="Login" />
+					<br>
+					<a href="{$baseurl}/join">No Account? Don't worry, sign up today!</a>
 {/if}
 					</div>
 				</form>