diff --git a/core/js/publicshareauth.js b/core/js/publicshareauth.js
index 374d7e92e16a1..3d694c7bfd6aa 100644
--- a/core/js/publicshareauth.js
+++ b/core/js/publicshareauth.js
@@ -47,6 +47,8 @@ document.addEventListener('DOMContentLoaded', function() {
 
 	// Adds functionality to the request password button
 	var passwordRequestButton = document.getElementById('request-password-button-not-talk');
-	passwordRequestButton.addEventListener('click', showEmailAddressPromptForm);
+	if (passwordRequestButton) {
+		passwordRequestButton.addEventListener('click', showEmailAddressPromptForm);
+	}
 
 });
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 5047b3e906f82..4ebe054ca7b4b 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -43,8 +43,7 @@ public function __construct(LoggerInterface $logger) {
 	 */
 	public function doFind($style) {
 		$app = substr($style, 0, strpos($style, '/'));
-		if (strpos($style, '3rdparty') === 0
-			&& $this->appendIfExist($this->serverroot, $style.'.css')
+		if ($this->appendIfExist($this->serverroot, $style.'.css')
 			|| $this->appendIfExist($this->serverroot, 'core/'.$style.'.css')
 		) {
 			return;