diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index ff2cb641f88..3694e672977 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -201,12 +201,16 @@ class LoginController extends Controller {
 
 		$parameters = [
 			'alt_login' => OC_App::getAlternativeLogIns(),
+			'pageTitle' => $this->l10n->t('Login'),
 		];
 
 		$this->initialStateService->provideInitialState('core', 'countAlternativeLogins', count($parameters['alt_login']));
 
 		return new TemplateResponse(
-			$this->appName, 'login', $parameters, 'guest'
+			$this->appName,
+			'login',
+			$parameters,
+			TemplateResponse::RENDER_AS_GUEST,
 		);
 	}
 
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 980d9abb7c4..432bc4e8601 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -7,7 +7,10 @@
  data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<meta charset="utf-8">
 		<title>
-		<?php p($theme->getTitle()); ?>
+			<?php
+				p(!empty($_['pageTitle']) ? $_['pageTitle'] . ' – ' : '');
+				p($theme->getTitle());
+			?>
 		</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
 		<?php if ($theme->getiTunesAppId() !== '') { ?>