diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f793275f2c..64353d4d4f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,7 +1,7 @@
- ownCloud
+ <?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud
diff --git a/lib/template.php b/lib/template.php
index 84302fd138..d991759fbc 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -314,8 +314,15 @@ class OC_Template{
}
// Add navigation entry
- $page->assign( "navigation", OC_App::getNavigation());
+ $navigation = OC_App::getNavigation();
+ $page->assign( "navigation", $navigation);
$page->assign( "settingsnavigation", OC_App::getSettingsNavigation());
+ foreach($navigation as $entry) {
+ if ($entry['active']) {
+ $page->assign( 'application', $entry['name'] );
+ break;
+ }
+ }
}else{
$page = new OC_Template( "core", "layout.guest" );
}