diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index b5e007e58f..30772d93e7 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -311,7 +311,7 @@
 				// Spawn a 'deleted' notice at the top of the page
 				deleteNotice.setAttribute('id', 'thread-deleted');
 				deleteNotice.className = 'alert';
-				deleteNotice.innerHTML = 'This thread has been deleted. Only users with thread management privileges can see it.<br /><br /><a href="/">Home</a>';
+				deleteNotice.innerHTML = 'This thread has been deleted. Only users with thread management privileges can see it.';
 				document.getElementById('content').insertBefore(deleteNotice, threadEl);
 
 				thread_state.deleted = '1';
diff --git a/src/webserver.js b/src/webserver.js
index 25ff4ab05a..6a8e99703c 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -145,15 +145,17 @@ passport.deserializeUser(function(uid, done) {
 	
 	// Complex Routes
 	app.get('/topic/:topic_id/:slug?', function(req, res) {
-		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + 'topic/' + req.params.topic_id + '");});</script>' + templates['footer']);
+		var topic_url = req.params.topic_id + (req.params.slug ? '/' + req.params.slug : '');
+		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '");});</script>' + templates['footer']);
 	});
 
 	app.get('/category/:category_id/:slug?', function(req, res) {
-		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + 'category/' + req.params.category_id + '");});</script>' + templates['footer']);
+		var category_url = req.params.category_id + (req.params.slug ? '/' + req.params.slug : '');
+		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("category/' + category_url + '");});</script>' + templates['footer']);
 	});
 
 	app.get('/confirm/:code', function(req, res) {
-		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + 'confirm/' + req.params.code + '");});</script>' + templates['footer']);
+		res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
 	});
 
 	// These functions are called via ajax once the initial page is loaded to populate templates with data