diff --git a/lib/Kalamar/Plugin/Auth.pm b/lib/Kalamar/Plugin/Auth.pm
index 662a5f7..bdb988d 100644
--- a/lib/Kalamar/Plugin/Auth.pm
+++ b/lib/Kalamar/Plugin/Auth.pm
@@ -235,11 +235,11 @@
 
 
   # Add login frame to sidebar
-  $app->content_block(
-    sidebar => {
-      template => 'partial/auth/login'
-    }
-  );
+  # $app->content_block(
+  #   sidebar => {
+  #     template => 'partial/auth/login'
+  #   }
+  # );
 
 
   # Add logout button to header button list
diff --git a/lib/Kalamar/Plugin/Auth/templates/partial/auth/login.html.ep b/lib/Kalamar/Plugin/Auth/templates/partial/auth/login.html.ep
index 5ad8a94..fe8fadc 100644
--- a/lib/Kalamar/Plugin/Auth/templates/partial/auth/login.html.ep
+++ b/lib/Kalamar/Plugin/Auth/templates/partial/auth/login.html.ep
@@ -1,4 +1,5 @@
 %# # user not logged in
+% my $embedded = stash('embedded');
 % if (!$embedded && !$c->auth->token) {
 %   if (flash('handle_or_email') && !param('handle_or_email')) {
 %     param(handle_or_email => flash('handle_or_email'));
diff --git a/t/plugin/auth-oauth.t b/t/plugin/auth-oauth.t
index b2a527e..1becd11 100644
--- a/t/plugin/auth-oauth.t
+++ b/t/plugin/auth-oauth.t
@@ -110,7 +110,7 @@
   ->content_like(qr/${q}authorized${q}:null/)
   ->element_exists_not('div.button.top a')
   ->element_exists_not('aside.active')
-  ->element_exists_not('aside.off')
+  ->element_exists('aside.off')
   ;
 
 $t->get_ok('/')
diff --git a/templates/partial/side.html.ep b/templates/partial/side.html.ep
index f8d81f0..5f7d2b8 100644
--- a/templates/partial/side.html.ep
+++ b/templates/partial/side.html.ep
@@ -2,7 +2,9 @@
 
 % my $classes = '';
 
-% if (length($side_bar) == 0) {
+%# TODO: This should not check for login!!!
+% my $helpers = app->renderer->helpers;
+% if (length($side_bar) == 0 && exists($helpers->{'auth.token'}) && $c->auth->token) {
 %   if (my $nav = navigation('settings')) {
 %     $side_bar = b('<nav>' . $nav . '</nav>');
 %     $classes = 'settings ';