diff --git a/services/web/app/coffee/Features/StaticPages/HomeController.coffee b/services/web/app/coffee/Features/StaticPages/HomeController.coffee
index ab60616d3e..3e9ac8439c 100755
--- a/services/web/app/coffee/Features/StaticPages/HomeController.coffee
+++ b/services/web/app/coffee/Features/StaticPages/HomeController.coffee
@@ -16,16 +16,11 @@ module.exports = HomeController =
 			else
 				res.redirect '/project'
 		else
-			if homepageExists
-				res.render 'external/home',
-					title: 'ShareLaTeX.com'
-			else
-				res.redirect "/login"
+			HomeController.home(req, res)
 
 	home: (req, res)->
 		if homepageExists
-			res.render 'external/home',
-				title: 'ShareLaTeX.com'
+			res.render 'external/home'
 		else
 			res.redirect "/login"
 
diff --git a/services/web/app/coffee/Features/User/UserPagesController.coffee b/services/web/app/coffee/Features/User/UserPagesController.coffee
index c082440e76..b3041bfa7a 100644
--- a/services/web/app/coffee/Features/User/UserPagesController.coffee
+++ b/services/web/app/coffee/Features/User/UserPagesController.coffee
@@ -34,7 +34,7 @@ module.exports =
 			dropboxHandler.getUserRegistrationStatus user._id, (err, status)->
 				userIsRegisteredWithDropbox = !err? and status.registered
 				res.render 'user/settings',
-					title:'Your settings',
+					title:'Account Settings',
 					userHasDropboxFeature: user.features.dropbox
 					userIsRegisteredWithDropbox: userIsRegisteredWithDropbox
 					user: user,
diff --git a/services/web/app/coffee/Features/Wiki/WikiController.coffee b/services/web/app/coffee/Features/Wiki/WikiController.coffee
index 8e743a634c..69dda8bba0 100644
--- a/services/web/app/coffee/Features/Wiki/WikiController.coffee
+++ b/services/web/app/coffee/Features/Wiki/WikiController.coffee
@@ -15,9 +15,15 @@ module.exports = WikiController =
 			return next(error) if error?
 			WikiController._getPageContent page, (error, page) ->
 				return next(error) if error?
+				if page.title == "Main Page"
+					title = "Documentation"
+				else
+					title = page.title
+					
 				res.render "wiki/page", {
 					page: page
 					contents: contents
+					title: title
 				}
 		
 	_getPageContent: (page, callback = (error, data = { content: "", title: "" }) ->) ->
diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 0f38f197ca..daa8701c60 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -3,10 +3,10 @@ html(itemscope, itemtype='http://schema.org/Product')
 	block vars
 
 	head
-		- if (typeof(priority_title) !== "undefined" && priority_title)
-			title= title + ' - Online LaTeX Editor ShareLaTeX'
-		- else
-			title= 'Online LaTeX Editor ShareLaTeX - ' +title
+		-if (typeof(title) == "undefined")
+			title ShareLaTeX, the Online LaTeX Editor
+		-else
+			title= title + ' - ShareLaTeX, the Online LaTeX Editor'
 		link(rel="icon", href="/favicon.ico")
 		link(rel='stylesheet', href='/stylesheets/style.css?fingerprint='+fingerprint('/stylesheets/style.css'))
 		link(href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css",rel="stylesheet")
diff --git a/services/web/app/views/wiki/page.jade b/services/web/app/views/wiki/page.jade
index 63fb3e65fb..d457325b41 100644
--- a/services/web/app/views/wiki/page.jade
+++ b/services/web/app/views/wiki/page.jade
@@ -9,9 +9,6 @@ block content
 				.col-xs-9.page
 					.card
 						.page-header
-							- if (page.title == "Main Page")
-								h1 ShareLaTeX Documentation
-							- else
-								h1 #{page.title}
+							h1 #{title}
 							
 						| !{page.content}
\ No newline at end of file