diff --git a/core/css/guest.css b/core/css/guest.css
index 02af5d3e0c..f2de4c832a 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -71,14 +71,14 @@ h3 {
 	background-position: center;
 	width: 252px;
 	min-height: 120px;
-	max-height: 300px;
+	max-height: 200px;
 	margin: 0 auto;
 }
 
 #header .logo img {
 	opacity: 0;
 	max-width: 100%;
-	max-height: 300px;
+	max-height: 200px;
 }
 .wrapper {
 	min-height: 100%;
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7e248ff2f7..1f38aaef5f 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -41,7 +41,7 @@
 									<?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')) ?>"/>
+									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>
 							</div>
 							<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>