diff --git a/app/Composers/StatusPageComposer.php b/app/Composers/StatusPageComposer.php
index 5c9dd505..d34192c8 100644
--- a/app/Composers/StatusPageComposer.php
+++ b/app/Composers/StatusPageComposer.php
@@ -64,7 +64,6 @@ class StatusPageComposer
         $view->with($withData)
             ->withComponentGroups($componentGroups)
             ->withUngroupedComponents($ungroupedComponents)
-            ->withScheduledMaintenance($scheduledMaintenance)
-            ->withPageTitle(Setting::get('app_name'));
+            ->withScheduledMaintenance($scheduledMaintenance);
     }
 }
diff --git a/app/Http/Controllers/SignupController.php b/app/Http/Controllers/SignupController.php
index bf5c0e2b..ae58d58c 100644
--- a/app/Http/Controllers/SignupController.php
+++ b/app/Http/Controllers/SignupController.php
@@ -49,8 +49,6 @@ class SignupController extends Controller
         }
 
         return View::make('signup')
-            ->withPageTitle(Setting::get('app_name'))
-            ->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')))
             ->withCode($invite->code)
             ->withUsername(Binput::old('username'))
             ->withEmail(Binput::old('emai', $invite->email));
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
index 72f921ae..7d5c6b52 100644
--- a/app/Http/Controllers/SubscribeController.php
+++ b/app/Http/Controllers/SubscribeController.php
@@ -38,7 +38,6 @@ class SubscribeController extends Controller
     public function showSubscribe()
     {
         return View::make('subscribe')
-            ->withPageTitle(Setting::get('app_name'))
             ->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
     }
 
diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php
index 9bbe63cc..f7d1188a 100644
--- a/resources/views/dashboard/partials/head.blade.php
+++ b/resources/views/dashboard/partials/head.blade.php
@@ -18,7 +18,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
 
-    <title>{{ isset($page_title) ? $page_title : Setting::get('app_name') }} | Cachet</title>
+    <title>@yield('pageTitle', isset($page_title) ? $page_title.' | Cachet' : 'Cachet')</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index c039a64a..a60ba6a4 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -1,5 +1,7 @@
 @extends('layout.clean')
 
+@section('pageTitle', trans('setup.setup'))
+
 @section('content')
 <div class="setup-page">
     <div class="text-center">