diff --git a/core/css/guest.css b/core/css/guest.css
index e6e194f641..02af5d3e0c 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -70,9 +70,16 @@ h3 {
 	background-size: 175px;
 	background-position: center;
 	width: 252px;
-	height: 120px;
+	min-height: 120px;
+	max-height: 300px;
 	margin: 0 auto;
 }
+
+#header .logo img {
+	opacity: 0;
+	max-width: 100%;
+	max-height: 300px;
+}
 .wrapper {
 	min-height: 100%;
 	margin: 0 auto -70px;
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 1e2559d696..7e248ff2f7 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -40,6 +40,9 @@
 								<h1 class="hidden-visually">
 									<?php p($theme->getName()); ?>
 								</h1>
+								<?php if(\OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
+									<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL('apps/theming/logo') . '?' . \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0')) ?>"/>
+								<?php endif; ?>
 							</div>
 							<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 						</div>