diff --git a/views/home.erb b/views/home.erb
index 520e4db..cee28c1 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -15,7 +15,3 @@
 <form action="/votes/new" method="get">
   <button type="submit">Create new vote</button>
 </form>
-
-<form action="/logout" method="post">
-  <button type="submit">Log out</button>
-</form>
diff --git a/views/layout.erb b/views/layout.erb
index 4e19a4e..1e18aaf 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -5,6 +5,11 @@
     <title>Title</title>
   </head>
   <body>
+    <% if current_user %>
+      <p>Logged in as <%= current_user.email %>. <a href="/logout">Logout</a></p>
+    <% else %>
+      <p><a href="/login">Login</a></p>
+    <% end %>
     <%= yield %>
   </body>
 </html>
diff --git a/vote.rb b/vote.rb
index 2efcd23..75b48da 100644
--- a/vote.rb
+++ b/vote.rb
@@ -84,6 +84,11 @@ post '/login' do
   end
 end
 
+get '/logout' do
+  session.clear
+  redirect '/login'
+end
+
 post '/logout' do
   session.clear
   redirect '/login'
