diff --git a/resources/footer.php b/resources/footer.php
index ea901b80b8..39b4f40a64 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -247,6 +247,8 @@
 		$view->assign('login_logo_source', $login_logo_source);
 		$view->assign('login_logo_width', $login_logo_width);
 		$view->assign('login_logo_height', $login_logo_height);
+	//login page
+		$view->assign('login_page', $login_page);
 	//messages
 		$view->assign('messages', message::html(true, '		'));
 
diff --git a/resources/login.php b/resources/login.php
index 07a5122c84..22e1a18eaf 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -376,6 +376,7 @@
 	}
 
 //add the footer
+	$login_page = true;
 	include "resources/footer.php";
 
 ?>
\ No newline at end of file
diff --git a/themes/default/css.php b/themes/default/css.php
index 5d8a331e7c..f14e6ca5e1 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -1093,10 +1093,8 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		display: inline-block;
 		width: 100%;
 		<?php
-		if (
-			isset($_SESSION['username']) && $_SESSION['username'] != '' &&
-			(isset($background_images) || $background_colors[0] != '' || $background_colors[1] != '')
-			) { ?>
+		if (isset($background_images) || $background_colors[0] != '' || $background_colors[1] != '') {
+			?>
 			background: <?php echo ($_SESSION['theme']['body_color']['text'] != '') ? $_SESSION['theme']['body_color']['text'] : "#ffffff"; ?>;
 			background-attachment: fixed;
 			<?php $br = format_border_radius($_SESSION['theme']['body_border_radius']['text'], '4px'); ?>
diff --git a/themes/default/template.php b/themes/default/template.php
index 394bd63e01..f80d2ccb3e 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -871,8 +871,18 @@
 			</td></tr></table>
 		</div>
 
-	{*//logged in *}
-		{if $authenticated}
+	{*//login page *}
+		{if $login_page}
+			<div id='default_login'>
+				<a href='{$project_path}/'><img id='login_logo' style='width: {$login_logo_width}; height: {$login_logo_height};' src='{$login_logo_source}'></a><br />
+				{$document_body}
+			</div>
+			<div id='footer_login'>
+				<span class='footer'>{$settings.theme.footer}</span>
+			</div>
+
+	{*//other pages *}
+		{else}
 			{if $settings.theme.menu_style == 'side' || $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'}
 				{$container_open}
 				{if $settings.theme.menu_style == 'inline'}{$logo}{/if}
@@ -889,16 +899,6 @@
 				<span class='footer'>{$settings.theme.footer}</span>
 			</div>
 			{$container_close}
-
-	{*//not logged in *}
-		{else}
-			<div id='default_login'>
-				<a href='{$project_path}/'><img id='login_logo' style='width: {$login_logo_width}; height: {$login_logo_height};' src='{$login_logo_source}'></a><br />
-				{$document_body}
-			</div>
-			<div id='footer_login'>
-				<span class='footer'>{$settings.theme.footer}</span>
-			</div>
 		{/if}
 
 </body>