diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index dcf0553a4eb059aa6730ce3b851af05fa45db727..da40fd83ad8044a736cb937caa43d7f54badcb19 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -33,17 +33,20 @@
?>
<?php endforeach; ?>
</head>
- <body id="body-login">
+ <body id="<?php p($_['bodyid']);?>">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
<div class="wrapper"><!-- for sticky footer -->
<div class="v-align"><!-- vertically centred box -->
- <header><div id="header">
- <div class="logo svg"></div>
- <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
- </div></header>
-
+ <?php if ($_['bodyid'] === 'body-login' ): ?>
+ <header>
+ <div id="header">
+ <div class="logo svg"></div>
+ <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+ </div>
+ </header>
+ <?php endif; ?>
<?php print_unescaped($_['content']); ?>
- <div class="push"></div><!-- for sticky footer -->
+ <div class="push"></div><!-- for sticky footer -->
</div>
</div>
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index b9a97186945300d71585013b434b0383aa9c824d..1de47ded3b3e3d8ab784dbec4be0b3eda27b0c4b 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -63,6 +63,7 @@ class OC_TemplateLayout extends OC_Template {
parent::__construct('core', 'layout.guest', '', false);
} else if ($renderas == 'guest') {
parent::__construct('core', 'layout.guest');
+ $this->assign('bodyid', 'body-login');
} else {
parent::__construct('core', 'layout.base');
}