diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e8bf80b8720..8875d5a8fbd 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -10,7 +10,7 @@
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
 <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>
+		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($defaults->getName()); ?>" /></a>
 		<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
 		<div class="header-right">
 			<?php if (isset($_['folder'])): ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 09e1006d507..2399512eacd 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -10,7 +10,7 @@
 
 	<head>
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($defaults->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 329744e3824..e20d28970a5 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -10,7 +10,7 @@
 
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($defaults->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
@@ -22,7 +22,7 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-	
+
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				print_unescaped('<'.$header['tag'].' ');
@@ -37,7 +37,7 @@
 	<body id="body-login">
 		<div id="login">
 			<header><div id="header">
-				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
+				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($defaults->getName()); ?>" />
 				<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
 			</div></header>
 			<?php print_unescaped($_['content']); ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index dacbe79bd34..87c02a83d3b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -7,11 +7,11 @@
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
 	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-	
+
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
 			<?php p(!empty($_['application'])?$_['application'].' | ':'');
-			p($defaults->getName());
+			p($defaults->getTitle());
 			p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
 		</title>
 		<meta charset="utf-8">
@@ -45,7 +45,7 @@
 	</div>
 	<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>
+				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($defaults->getName()); ?>" /></a>
 			<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 562ad82e953..a9fdff06067 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -5,7 +5,7 @@
 <tr>
 <td bgcolor="#1d2d44" width="20px">&nbsp;</td>
 <td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/>
+<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($defaults->getName()); ?>"/>
 </td>
 </tr>
 <tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
diff --git a/lib/defaults.php b/lib/defaults.php
index 196bb5cf14d..10813a3e8d8 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -16,6 +16,7 @@ class OC_Defaults {
 
 	private $defaultEntity;
 	private $defaultName;
+	private $defaultTitle;
 	private $defaultBaseUrl;
 	private $defaultSyncClientUrl;
 	private $defaultDocBaseUrl;
@@ -25,8 +26,9 @@ class OC_Defaults {
 	function __construct() {
 		$l = OC_L10N::get('core');
 
-		$this->defaultEntity = "ownCloud";
-		$this->defaultName = "ownCloud";
+		$this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
+		$this->defaultName = "ownCloud"; /* short name, used when referring to the software */
+		$this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */
 		$this->defaultBaseUrl = "http://owncloud.org";
 		$this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
@@ -69,6 +71,14 @@ class OC_Defaults {
 		}
 	}
 
+	public function getTitle() {
+		if ($this->themeExist('getTitle')) {
+			return $this->theme->getTitle();
+		} else {
+			return $this->defaultTitle;
+		}
+	}
+
 	public function getName() {
 		if ($this->themeExist('getName')) {
 			return $this->theme->getName();
