diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 3cb8ee2584d97..623aad063f17f 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -91,14 +91,17 @@
 }
 
 /* override styles for login screen in guest.css */
-@if variable_exists('theming-logo-mime') {
+@if variable_exists('theming-logo-mime') and $theming-logo-mime != '' {
 	#header .logo {
 		background-image: url(#{$image-logo});
 		background-size: contain;
 	}
+	#body-login #header .logo {
+		margin-bottom: 22px;
+	}
 }
 
-@if variable_exists('theming-background-mime') {
+@if variable_exists('theming-background-mime') and $theming-background-mime != ''  {
 	#body-login,
 	#firstrunwizard .firstrunwizard-header,
 	#theming-preview {
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 5e6d432c80533..3acdae0e39575 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -178,7 +178,9 @@ public function __construct( $renderAs, $appId = '' ) {
 		if(\OC::$server->getSystemConfig()->getValue('installed', false)
 			&& !\OCP\Util::needUpgrade()
 			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)) {
+			&& !preg_match('/^\/login/', $pathInfo)
+			&& $renderAs !== 'error' && $renderAs !== 'guest'
+		) {
 			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
 		} else {
 			// If we ignore the scss compiler,