diff --git a/templates/login.tpl b/templates/login.tpl
index 840c137c1dd92a296089e2c09b1bf81d819f38f9..9ec309c1b16fa86e24fe841affb6dff3fda9cf58 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -2,17 +2,16 @@
 				<form method="post" action="{$ssl_url|escape:'htmlall'}{getparams gets=$gets}">
 					<div>
 {if $session->loggedin}
-	Logged in as <a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a><br />
-	<a href="{$baseurl}/Options">Membership Options</a><br />
+	Hello <a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a>! You have
 	{if $session->email_forward}
-		Mail forwarded to {$session->email_forward}<br />
+		mail forwarded to {$session->email_forward}<br />
 	{else}
 		{if $session->email==0}
-			No new email
+			no new email
 		{elseif $session->email==1}
-			<a href="https://sucs.org/webmail/">New email</a>
+			<a href="https://sucs.org/webmail/">new email</a>
 		{/if}
-
+	<br /><a href="{$baseurl}/Options">Membership Options</a><br />
 	{/if}
 	<input type="submit" class="button" name="Logout" id="Logout" value="Logout" />
 {else}