diff --git a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee b/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee
index 5bc463bc76..7686186ffb 100644
--- a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee
+++ b/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee
@@ -7,12 +7,14 @@ module.exports = TemplatesWebController =
 	renderTemplatesIndexPage: (req, res)->
 		logger.log "rendering index page of templates"
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{req.params.user_id}", (err, data)->
+			data.title = "LaTeX Templates"
 			res.render "templates/index", data
 
 	renerTemplateInTag: (req, res)->
 		logger.log "rendering latex template page"
 		{user_id, tag_name, template_name} = req.params
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/tag/#{tag_name}/template/#{template_name}", (err, data)->
+			data.title = data.template.name
 			res.render "templates/template", data
 
 	tagOrCanonicalPage: (req, res)->
@@ -26,7 +28,6 @@ module.exports = TemplatesWebController =
 			logger.log params:req.params, "problem rendering tagOrCanonicalPage"
 			res.send 500
 
-
 	proxyToTemplatesApi: (req, res)->
 		url = req.url
 		logger.log url:url, "proxying request to templates api"
@@ -47,13 +48,14 @@ module.exports = TemplatesWebController =
 		{user_id} = req.params
 		logger.log user_id:user_id, "rendering all templates page"
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/all", (err, data)->
-			data.title = "HELLLLo"
+			data.title = "All Templates"
 			res.render "templates/tag", data
 
 	_renderTagPage: _renderTagPage = (req, res)->
 		{user_id, tag_name} = req.params
 		logger.log user_id:user_id, tag_name:tag_name, "rendinging tag page for templates"
 		TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/tag/#{tag_name}", (err, data)->
+			data.title = data.tag.name
 			res.render "templates/tag", data
 
 	_getDataFromTemplatesApi: _getDataFromTemplatesApi = (path, callback)->
diff --git a/services/web/test/UnitTests/coffee/Templates/TemplatesWebControllerTests.coffee b/services/web/test/UnitTests/coffee/Templates/TemplatesWebControllerTests.coffee
index 7a1947ab0b..de0434f04a 100644
--- a/services/web/test/UnitTests/coffee/Templates/TemplatesWebControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Templates/TemplatesWebControllerTests.coffee
@@ -18,7 +18,8 @@ describe "TemplatesWebController", ->
 			"settings-sharelatex":@settings
 			"logger-sharelatex": log:->
 		@stubbedApiData = 
-			templates:[{_id:"12312321"}]
+			template:{_id:"12312321", name:"bob"}
+			tag: {name:"tag name"}
 
 		@TemplatesWebController._getDataFromTemplatesApi = sinon.stub().callsArgWith(1, null, @stubbedApiData)