diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 93601c350f..cbd5ddf7a7 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -9,9 +9,7 @@
 <header><div id="header">
 	<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 		src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-	<?php if (OC_Util::getEditionString() !== ''): ?>
-		<div id="logo-claim" style="display:none;">Enterprise Edition</div>
-	<?php endif; ?>
+	<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
 	<div class="header-right">
 	<?php if (isset($_['folder'])): ?>
 		<span id="details"><?php p($l->t('%s shared the folder %s with you',
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index ec73ad5456..fde970554c 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,9 +35,7 @@
 		<div id="login">
 			<header><div id="header">
 				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-				<?php if (OC_Util::getEditionString() !== ''): ?>
-				<div id="logo-claim" style="display:none;">Enterprise Edition</div>
-				<?php endif; ?>
+				<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
 			</div></header>
 			<?php print_unescaped($_['content']); ?>
 		</div>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8c82a5c028..b424669e35 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,9 +43,7 @@
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-			<?php if (OC_Util::getEditionString() !== ''): ?>
-			<div id="logo-claim" style="display:none;">Enterprise Edition</div>
-			<?php endif; ?>
+			<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
diff --git a/lib/defaults.php b/lib/defaults.php
index 44c1a7e150..215b148f94 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -17,6 +17,7 @@ class OC_Defaults {
 	private static $defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
 	private static $defaultDocBaseUrl = "http://doc.owncloud.org";
 	private static $defaultSlogan = "web services under your control";
+	private static $defaultLogoClaim = "ownCloud Community";
 
 	private function themeExist($method) {
 		if (OC_Util::getTheme() !== '' && method_exists('OC_Theme', $method)) {
@@ -74,6 +75,14 @@ class OC_Defaults {
 		}
 	}
 
+	public static function getLogoClaim() {
+		if (self::themeExist('getLogoClaim')) {
+			return OC_Theme::getLogoClaim();
+		} else {
+			return self::$defaultLogoClaim;
+		}
+	}
+
 	public static function getShortFooter() {
 		if (self::themeExist('getShortFooter')) {
 			$footer = OC_Theme::getShortFooter();