diff --git a/core/css/styles.css b/core/css/styles.css
index e1999a61a52ed05a1ef6f72274283f176f00ba66..b17224b269a6485b48de5dc13d15c771e98c221a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -3,7 +3,7 @@ body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana
/* HEADERS */
-#body-user #header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; box-shadow:0 0 10px #000, inset 0 -2px 10px #222; }
+#body-user #header, #body-settings #header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; box-shadow:0 0 10px #000, inset 0 -2px 10px #222; }
#body-login #header { margin:-2em auto 0; text-align:center; height:10em;
-moz-box-shadow:0 0 1em #000; -webkit-box-shadow:0 0 1em #000; box-shadow:0 0 1em #000;
background: #1d2d44; /* Old browsers */
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index db142241d644ee4c36caaffce7e32ccac612f83d..4cbf6261cbe7e5e276665e7ff101e6bacec76877 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -27,7 +27,7 @@
<?php endforeach; ?>
</head>
- <body id="body-user">
+ <body id="<?php echo $_['bodyid'];?>">
<div id="header">
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<?php echo $_['searchbox']?>
diff --git a/lib/template.php b/lib/template.php
index 12047a38a13658a130b36107ab9b21b707a15828..9d13b142dba3ac88caf18790acae64314ec645a3 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -239,6 +239,11 @@ class OC_Template{
$search=new OC_Template( 'core', 'part.searchbox');
$search->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
$page->assign('searchbox', $search->fetchPage());
+ if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
+ $page->assign('bodyid','body-settings');
+ }else{
+ $page->assign('bodyid','body-user');
+ }
// Add navigation entry
$page->assign( "navigation", OC_App::getNavigation());