diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index 5adf3700..a65b67bc 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -12,7 +12,7 @@ class AuthController
 	*/
 	public function loginAction()
 	{
-		$this->context->subTitle = 'login form';
+		$this->context->subTitle = 'authentication form';
 
 		//check if already logged in
 		if ($this->context->loggedIn)
diff --git a/src/Views/auth-login.phtml b/src/Views/auth-login.phtml
index eebfa233..13c45b61 100644
--- a/src/Views/auth-login.phtml
+++ b/src/Views/auth-login.phtml
@@ -10,7 +10,7 @@
 	</div>
 
 	<div>
-		<input type="submit" value="Login">
+		<input type="submit" value="Log in"/>
 	</div>
 </form>
 
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 997374ac..d7d3a9c7 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -30,13 +30,13 @@
 
 						if (!$this->context->loggedIn)
 						{
-							$postNav []= ['Login', \Chibi\UrlHelper::route('auth', 'login')];
+							$postNav []= ['Log in', \Chibi\UrlHelper::route('auth', 'login')];
 							$postNav []= ['Register', \Chibi\UrlHelper::route('auth', 'register')];
 						}
 						else
 						{
 							$postNav []= ['Account', \Chibi\UrlHelper::route('user', 'show', ['name' => $this->context->user->name])];
-							$postNav []= ['Logout', \Chibi\UrlHelper::route('auth', 'logout')];
+							$postNav []= ['Log out', \Chibi\UrlHelper::route('auth', 'logout')];
 						}
 
 						function printNav($nav)