diff --git a/server/templates/addReview.mjml b/server/templates/addReview.mjml
index 9d00be7d0..644970f6e 100755
--- a/server/templates/addReview.mjml
+++ b/server/templates/addReview.mjml
@@ -30,7 +30,7 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>
 						We hope you’re finding Checkmate helpful in monitoring your infrastructure.
 						Your support means a lot to us, and we <b>truly appreciate</b> having you as
diff --git a/server/templates/employeeActivation.mjml b/server/templates/employeeActivation.mjml
index 3e35db6e8..317832c1f 100755
--- a/server/templates/employeeActivation.mjml
+++ b/server/templates/employeeActivation.mjml
@@ -29,10 +29,12 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>One of the admins created an account for you on the Checkmate server.</p>
 					<p>You can go ahead and create your account using this link.</p>
-					<p><a href="{{link}}">{{link}}</a></p>
+					<p>
+						<a href="{{link}}">{{ link }}</a>
+					</p>
 					<p>Thank you.</p>
 				</mj-text>
 			</mj-column>
diff --git a/server/templates/hardwareIncident.mjml b/server/templates/hardwareIncident.mjml
index 19fb589fc..3f50a3d58 100755
--- a/server/templates/hardwareIncident.mjml
+++ b/server/templates/hardwareIncident.mjml
@@ -47,10 +47,10 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
-					<p>{{monitor}} at {{url}} has the following infrastructure alerts:</p>
+					<p>Hello {{ name }}!</p>
+					<p>{{ monitor }} at {{ url }} has the following infrastructure alerts:</p>
 					{{#each alerts}}
-					<p>• {{this}}</p>
+					<p>• {{ this }}</p>
 					{{/each}}
 				</mj-text>
 			</mj-column>
diff --git a/server/templates/noIncidentsThisWeek.mjml b/server/templates/noIncidentsThisWeek.mjml
index d31d63d10..d160e44de 100755
--- a/server/templates/noIncidentsThisWeek.mjml
+++ b/server/templates/noIncidentsThisWeek.mjml
@@ -45,7 +45,7 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>There were no incidents this week. Good job!</p>
 					<p><b>Current monitors:</b></p>
 					<p><b>Google:</b> 100% availability</p>
diff --git a/server/templates/passwordReset.mjml b/server/templates/passwordReset.mjml
index e0b85a4f4..5da29b341 100755
--- a/server/templates/passwordReset.mjml
+++ b/server/templates/passwordReset.mjml
@@ -31,10 +31,10 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>
 						You are receiving this email because a password reset request has been made
-						for {{email}}. Please use the link below on the site to reset your password.
+						for {{ email }}. Please use the link below on the site to reset your password.
 					</p>
 					<a href="{{url}}">Reset Password</a>
 					<p>If you didn't request this, please ignore this email.</p>
diff --git a/server/templates/serverIsDown.mjml b/server/templates/serverIsDown.mjml
index b75d970e6..d46011070 100755
--- a/server/templates/serverIsDown.mjml
+++ b/server/templates/serverIsDown.mjml
@@ -36,7 +36,7 @@
 					font-size="18px"
 					color="red"
 				>
-					{{monitor}} is down
+					{{ monitor }} is down
 				</mj-text>
 				<mj-divider
 					border-width="2px"
@@ -47,13 +47,13 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>
 						We detected an incident on one of your monitors. Your service is currently
 						down. We'll send a message to you once it is up again.
 					</p>
-					<p><b>Monitor name:</b> {{monitor}}</p>
-					<p><b>URL:</b> {{url}}</p>
+					<p><b>Monitor name:</b> {{ monitor }}</p>
+					<p><b>URL:</b> {{ url }}</p>
 				</mj-text>
 			</mj-column>
 			<mj-column width="100%">
diff --git a/server/templates/serverIsUp.mjml b/server/templates/serverIsUp.mjml
index beb34481d..074c5e3dd 100755
--- a/server/templates/serverIsUp.mjml
+++ b/server/templates/serverIsUp.mjml
@@ -36,7 +36,7 @@
 					font-size="18px"
 					color="green"
 				>
-					{{monitor}} is up
+					{{ monitor }} is up
 				</mj-text>
 				<mj-divider
 					border-width="2px"
@@ -47,10 +47,10 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>Your latest incident is resolved and your monitored service is up again.</p>
-					<p><b>Monitor name:</b> {{monitor}}</p>
-					<p><b>URL:</b> {{url}}</p>
+					<p><b>Monitor name:</b> {{ monitor }}</p>
+					<p><b>URL:</b> {{ url }}</p>
 				</mj-text>
 			</mj-column>
 			<mj-column width="100%">
diff --git a/server/templates/welcomeEmail.mjml b/server/templates/welcomeEmail.mjml
index 663518ec2..372e4c8ae 100755
--- a/server/templates/welcomeEmail.mjml
+++ b/server/templates/welcomeEmail.mjml
@@ -30,7 +30,7 @@
 		<mj-section>
 			<mj-column width="100%">
 				<mj-text>
-					<p>Hello {{name}}!</p>
+					<p>Hello {{ name }}!</p>
 					<p>
 						Thank you for trying out Checkmate! We developed it with great care to meet
 						our own needs, and we're excited to share it with you.