diff --git a/views/mail/activation.blade.php b/views/mail/activation.blade.php
index 875ab92..cd57454 100644
--- a/views/mail/activation.blade.php
+++ b/views/mail/activation.blade.php
@@ -1,22 +1,22 @@
 subject = "Please verify your email address"
 ==
-Hi {first_name},
+Hi {{$first_name}},
 
-Complete your registration with {site_name}.
+Complete your registration with {{$site_name}}.
 
 Please click this link to verify your email address:
 
-{account_activation_link}
+{{$account_activation_link}}
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
-## Complete your registration with {site_name}.
+## Complete your registration with {{$site_name}}.
 
 Please click the button below to verify your email address:
 
-@partial('button', ['url' => '{account_activation_link}', 'type' => 'primary'])
+@partial('button', ['url' => $account_activation_link, 'type' => 'primary'])
 Confirm my account
 @endpartial
 
 Alternatively, copy and paste the link below in a new browser window: <br>
-{account_activation_link}
\ No newline at end of file
+{{$account_activation_link}}
diff --git a/views/mail/password_reset.blade.php b/views/mail/password_reset.blade.php
index 5166c57..88575a4 100644
--- a/views/mail/password_reset.blade.php
+++ b/views/mail/password_reset.blade.php
@@ -1,20 +1,20 @@
-subject = "Password reset at {site_name}"
+subject = "Password reset at {{$site_name}}"
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
 Your password was changed successfully!
 
 Please login using your new password:
-{account_login_link}
+{{$account_login_link}}
 
 If you think this password update was a mistake, reset your password immediately.
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
 ## Your password was changed successfully!
 
-@partial('button', ['url' => '{account_login_link}', 'type' => 'primary'])
+@partial('button', ['url' => $account_login_link, 'type' => 'primary'])
 Login using your new password
 @endpartial
 
-If you think this password update was a mistake, reset your password immediately.
\ No newline at end of file
+If you think this password update was a mistake, reset your password immediately.
diff --git a/views/mail/password_reset_request.blade.php b/views/mail/password_reset_request.blade.php
index 108b75d..e7385a0 100644
--- a/views/mail/password_reset_request.blade.php
+++ b/views/mail/password_reset_request.blade.php
@@ -1,20 +1,20 @@
-subject = "Password reset request at {site_name}"
+subject = "Password reset request at {{$site_name}}"
 ==
-Hi, {first_name} {last_name}
+Hi, {{$first_name}} {{$last_name}}
 
-Someone requested a password reset for your {site_name} account.
+Someone requested a password reset for your {{$site_name}} account.
 
-If you did request a password reset, copy and paste the link below in a new browser window: {reset_link}
+If you did request a password reset, copy and paste the link below in a new browser window: {{$reset_link}}
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
-Someone requested a password reset for your {site_name} account.
+Someone requested a password reset for your {{$site_name}} account.
 
 If you did request a password reset, click the button below to reset your password:
 
-@partial('button', ['url' => '{reset_link}', 'type' => 'primary'])
+@partial('button', ['url' => $reset_link, 'type' => 'primary'])
 Reset your password
 @endpartial
 
 Alternatively, copy and paste the link below in a new browser window: <br>
-{reset_link}
\ No newline at end of file
+{{$reset_link}}
diff --git a/views/mail/registration.blade.php b/views/mail/registration.blade.php
index 30a4f96..1428025 100644
--- a/views/mail/registration.blade.php
+++ b/views/mail/registration.blade.php
@@ -1,17 +1,17 @@
-subject = "Welcome to {site_name}"
+subject = "Welcome to {{$site_name}}"
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
-Thank you for registering with {site_name}.
+Thank you for registering with {{$site_name}}.
 
-Your account has now been created and you can log in using your email address and password by visiting our website or at the following URL: {account_login_link}
+Your account has now been created and you can log in using your email address and password by visiting our website or at the following URL: {{$account_login_link}}
 ==
-Hi {first_name} {last_name},
+Hi {{$first_name}} {{$last_name}},
 
-## Thank you for registering with {site_name}.
+## Thank you for registering with {{$site_name}}.
 
 Your account has now been created and you can log in using your email address and password by clicking the button below:
 
-@partial('button', ['url' => '{account_login_link}', 'type' => 'primary'])
+@partial('button', ['url' => $account_login_link, 'type' => 'primary'])
 Login into your account
-@endpartial
\ No newline at end of file
+@endpartial
diff --git a/views/mail/registration_alert.blade.php b/views/mail/registration_alert.blade.php
index d6bfc9c..2a2c615 100644
--- a/views/mail/registration_alert.blade.php
+++ b/views/mail/registration_alert.blade.php
@@ -1,9 +1,9 @@
-subject = "New Customer on {site_name}"
+subject = "New Customer on {{$site_name}}"
 ==
 You have a new customer!
 
-Customer name: {first_name} {last_name}
+Customer name: {{$first_name}} {{$last_name}}
 ==
 ## You have a new customer!
 
-**Customer name:** {first_name} {last_name}
\ No newline at end of file
+**Customer name:** {{$first_name}} {{$last_name}}