diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 03da7559b8c669651e2124b07ab728169a5abc04..2f3bf8752cd14f1cb2bfd003069fe2ad6dd3bd71 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,6 +35,9 @@
 		<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">Enterprise Edition</div>
+				<?php endif; ?>
 			</div></header>
 			<?php print_unescaped($_['content']); ?>
 		</div>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e2be2f951eb51c7d958925c84ea38ae31343dd43..44ae4c6ca3553c15d25a958ccd83c1ccecf18077 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,7 +43,9 @@
 	<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">Enterprise Edition</div>
+			<?php endif; ?>
 			<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>