diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f793275f2ca9948c9b9189403250d2f09e6920fd..64353d4d4f45101863b0c610a2b0a6b8bdaea3e9 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>ownCloud</title>
+ <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
diff --git a/lib/template.php b/lib/template.php
index 84302fd138513a1168aa9b211583b00f2f2891f7..d991759fbcd96b3fbca7a60eccd1d13cdfe6d973 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" );
}