diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
index 8d29704c97069..6b8341f70470e 100644
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/PublicAuth.php
@@ -97,7 +97,10 @@ protected function validateUserPass($username, $password) {
 
 		// check if the share is password protected
 		if ($share->getPassword() !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+
+			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
+				|| $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL
+				|| $share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} else if ($this->session->exists('public_link_authenticated')
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 6c6ace237b931..7d64d0147a990 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1329,7 +1329,8 @@ protected function checkExpireDate($share) {
 	 */
 	public function checkPassword(\OCP\Share\IShare $share, $password) {
 		$passwordProtected = $share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK
-			|| $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL;
+							 || $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL
+							 || $share->getShareType() !== \OCP\Share::SHARE_TYPE_CIRCLE;
 		if (!$passwordProtected) {
 			//TODO maybe exception?
 			return false;