diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee
index 36f4d273cb..15ce3fc6f6 100644
--- a/services/web/app/coffee/Features/Project/ProjectController.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectController.coffee
@@ -1,3 +1,4 @@
+async = require("async")
 logger = require("logger-sharelatex")
 projectDeleter = require("./ProjectDeleter")
 projectDuplicator = require("./ProjectDuplicator")
@@ -37,19 +38,16 @@ module.exports =
 		projectName = sanitize.escape(req.body.projectName)
 		template = sanitize.escape(req.body.template)
 		logger.log user: user, type: template, name: projectName, "creating project"
-		if template == 'example'
-			projectCreationHandler.createExampleProject user._id, projectName, (err, project)->
-				if err?
-					logger.error err: err, project: project, user: user, name: projectName, type: "example", "error creating project"
-					res.send 500
+		async.waterfall [
+			(cb)->
+				if template == 'example'
+					projectCreationHandler.createExampleProject user._id, projectName, cb
 				else
-					logger.log project: project, user: user, name: projectName, type: "example", "created project"
-					res.send {project_id:project._id}
-		else
-			projectCreationHandler.createBasicProject user._id, projectName, (err, project)->
-				if err?
-					logger.error err: err, project: project, user: user, name: projectName, type: "basic", "error creating project"
-					res.send 500
-				else
-					logger.log project: project, user: user, name: projectName, type: "basic", "created project"
-					res.send {project_id:project._id}
\ No newline at end of file
+					projectCreationHandler.createBasicProject user._id, projectName, cb
+		], (err, project)->
+			if err?
+				logger.error err: err, project: project, user: user, name: projectName, type: template, "error creating project"
+				res.send 500
+			else
+				logger.log project: project, user: user, name: projectName, type: template, "created project"
+				res.send {project_id:project._id}
\ No newline at end of file