diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 1e5da03ce..b13f6afb7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -32,24 +32,21 @@
     %header
       .container
         #session_action
-          - if user_signed_in?
-            %ul#user_menu
-              %li#global_search
-                = form_tag(users_path, :method => 'get') do
-                  %label{:for => 'q'} Search
-                  = text_field_tag 'q'
+          %ul#user_menu
+            %li#global_search
+              = form_tag(users_path, :method => 'get') do
+                %label{:for => 'q'} Search
+                = text_field_tag 'q'
 
-              %li
-                %ul#other_user_menu
-                  %li
-                    = owner_image_tag 
-                    = link_to current_user.real_name, current_user.person
-                  %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
-                  %li.settings= link_to "settings", edit_user_path(current_user)
-                  %li.logout= link_to "logout", destroy_user_session_path
+            %li
+              %ul#other_user_menu
+                %li
+                  = owner_image_tag 
+                  = link_to current_user.real_name, current_user.person
+                %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
+                %li.settings= link_to "settings", edit_user_path(current_user)
+                %li.logout= link_to "logout", destroy_user_session_path
 
-          - else
-            = link_to "login", new_user_session_path
 
         #diaspora_text{:href => root_path}
           = link_to "DIASPORA*", root_path