diff --git a/templates/email/notification_new_user.php b/templates/email/notification_new_user.php
index 0bb89392..59be08f7 100644
--- a/templates/email/notification_new_user.php
+++ b/templates/email/notification_new_user.php
@@ -1,34 +1,45 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+<?php
+/**
+ * Template for the "New User Notification".
+ * Whether to receive notification when a new user account is created.
+ *
+ * This template can be overridden by copying it to {your-theme}/ultimate-member/email/notification_new_user.php
+ *
+ * @version 2.6.1
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 
 <div style="max-width: 560px;padding: 20px;background: #ffffff;border-radius: 5px;margin:40px auto;font-family: Open Sans,Helvetica,Arial;font-size: 15px;color: #666;">
 
 	<div style="color: #444444;font-weight: normal;">
 		<div style="text-align: center;font-weight:600;font-size:26px;padding: 10px 0;border-bottom: solid 3px #eeeeee;">{site_name}</div>
-		
+
 		<div style="clear:both"></div>
 	</div>
-	
+
 	<div style="padding: 0 30px 30px 30px;border-bottom: 3px solid #eeeeee;">
 
 		<div style="padding: 30px 0;font-size: 24px;text-align: center;line-height: 40px;">{display_name} has just created an account on {site_name}.</span></div>
 
 		<div style="padding: 10px 0 50px 0;text-align: center;">To view their profile click here: <a href="{user_profile_link}" style="color: #3ba1da;text-decoration: none;">{user_profile_link}</a></div>
-		
+
 		<div style="padding: 0 0 15px 0;">
-		
+
 			<div style="background: #eee;color: #444;padding: 12px 15px; border-radius: 3px;font-weight: bold;font-size: 16px;">Here is the submitted registration form:<br /><br />
 				{submitted_registration}
 			</div>
 		</div>
-		
-	</div>
-	
-	<div style="color: #999;padding: 20px 30px">
-		
-		<div style="">Thank you!</div>
-		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
-		
+
 	</div>
 
-</div>
\ No newline at end of file
+	<div style="color: #999;padding: 20px 30px">
+
+		<div style="">Thank you!</div>
+		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
+
+	</div>
+
+</div>
diff --git a/templates/email/notification_review.php b/templates/email/notification_review.php
index 0f53b7f3..cab18131 100644
--- a/templates/email/notification_review.php
+++ b/templates/email/notification_review.php
@@ -1,34 +1,45 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+<?php
+/**
+ * Template for the "Account Needs Review Notification".
+ * Whether to receive notification when an account needs admin review.
+ *
+ * This template can be overridden by copying it to {your-theme}/ultimate-member/email/notification_review.php
+ *
+ * @version 2.6.1
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 
 <div style="max-width: 560px;padding: 20px;background: #ffffff;border-radius: 5px;margin:40px auto;font-family: Open Sans,Helvetica,Arial;font-size: 15px;color: #666;">
 
 	<div style="color: #444444;font-weight: normal;">
 		<div style="text-align: center;font-weight:600;font-size:26px;padding: 10px 0;border-bottom: solid 3px #eeeeee;">{site_name}</div>
-		
+
 		<div style="clear:both"></div>
 	</div>
-	
+
 	<div style="padding: 0 30px 30px 30px;border-bottom: 3px solid #eeeeee;">
 
 		<div style="padding: 30px 0;font-size: 24px;text-align: center;line-height: 40px;">{display_name} has just applied for membership to {site_name} and is waiting to be reviewed.</span></div>
 
 		<div style="padding: 10px 0 50px 0;text-align: center;">To review this member please click the following link: <a href="{user_profile_link}" style="color: #3ba1da;text-decoration: none;">{user_profile_link}</a></div>
-		
+
 		<div style="padding: 0 0 15px 0;">
-		
+
 			<div style="background: #eee;color: #444;padding: 12px 15px; border-radius: 3px;font-weight: bold;font-size: 16px;">Here is the submitted registration form:<br /><br />
 				{submitted_registration}
 			</div>
 		</div>
-		
-	</div>
-	
-	<div style="color: #999;padding: 20px 30px">
-		
-		<div style="">Thank you!</div>
-		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
-		
+
 	</div>
 
-</div>
\ No newline at end of file
+	<div style="color: #999;padding: 20px 30px">
+
+		<div style="">Thank you!</div>
+		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
+
+	</div>
+
+</div>
diff --git a/templates/email/pending_email.php b/templates/email/pending_email.php
index 7dc70554..b8cd6f58 100644
--- a/templates/email/pending_email.php
+++ b/templates/email/pending_email.php
@@ -1,27 +1,38 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+<?php
+/**
+ * Template for the "Your account is pending review".
+ * Whether to send the user an email when his account needs admin review.
+ *
+ * This template can be overridden by copying it to {your-theme}/ultimate-member/email/pending_email.php
+ *
+ * @version 2.6.1
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 
 <div style="max-width: 560px;padding: 20px;background: #ffffff;border-radius: 5px;margin:40px auto;font-family: Open Sans,Helvetica,Arial;font-size: 15px;color: #666;">
 
 	<div style="color: #444444;font-weight: normal;">
 		<div style="text-align: center;font-weight:600;font-size:26px;padding: 10px 0;border-bottom: solid 3px #eeeeee;">{site_name}</div>
-		
+
 		<div style="clear:both"></div>
 	</div>
-	
+
 	<div style="padding: 0 30px 30px 30px;border-bottom: 3px solid #eeeeee;">
 
 		<div style="padding: 30px 0;font-size: 24px;text-align: center;line-height: 40px;">Thank you for signing up!<span style="display: block;">Your account has to be manually reviewed.</span></div>
-		
+
 		<div style="padding: 15px;background: #eee;border-radius: 3px;text-align: center;">Please allow us some time to process your request and review your information.</div>
-		
-	</div>
-	
-	<div style="color: #999;padding: 20px 30px">
-		
-		<div style="">Thank you!</div>
-		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
-		
+
 	</div>
 
-</div>
\ No newline at end of file
+	<div style="color: #999;padding: 20px 30px">
+
+		<div style="">Thank you!</div>
+		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
+
+	</div>
+
+</div>
diff --git a/templates/email/rejected_email.php b/templates/email/rejected_email.php
index 5861d29f..e1343bd2 100644
--- a/templates/email/rejected_email.php
+++ b/templates/email/rejected_email.php
@@ -1,26 +1,37 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+<?php
+/**
+ * Template for the "Account Rejected Email".
+ * Whether to send the user an email when his account is rejected.
+ *
+ * This template can be overridden by copying it to {your-theme}/ultimate-member/email/rejected_email.php
+ *
+ * @version 2.6.1
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div style="max-width: 560px;padding: 20px;background: #ffffff;border-radius: 5px;margin:40px auto;font-family: Open Sans,Helvetica,Arial;font-size: 15px;color: #666;">
 
 	<div style="color: #444444;font-weight: normal;">
 		<div style="text-align: center;font-weight:600;font-size:26px;padding: 10px 0;border-bottom: solid 3px #eeeeee;">{site_name}</div>
-		
+
 		<div style="clear:both"></div>
 	</div>
-	
+
 	<div style="padding: 0 30px 30px 30px;border-bottom: 3px solid #eeeeee;">
 
 		<div style="padding: 30px 0;font-size: 24px;text-align: center;line-height: 40px;">Your registration request has been rejected.</div>
-		
+
 		<div style="padding: 15px;background: #eee;border-radius: 3px;text-align: center;">Please feel free to apply at a future date or <a href="mailto:{admin_email}" style="color: #3ba1da;text-decoration: none">contact us</a> If you want your information to be reviewed again.</div>
-		
-	</div>
-	
-	<div style="color: #999;padding: 20px 30px">
-		
-		<div style="">Thank you!</div>
-		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
-		
+
 	</div>
 
-</div>
\ No newline at end of file
+	<div style="color: #999;padding: 20px 30px">
+
+		<div style="">Thank you!</div>
+		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
+
+	</div>
+
+</div>
diff --git a/templates/email/resetpw_email.php b/templates/email/resetpw_email.php
index a4d999a9..6f688ddd 100644
--- a/templates/email/resetpw_email.php
+++ b/templates/email/resetpw_email.php
@@ -1,28 +1,39 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+<?php
+/**
+ * Template for the "Password Reset Email".
+ * Whether to send an email when users changed their password.
+ *
+ * This template can be overridden by copying it to {your-theme}/ultimate-member/email/resetpw_email.php
+ *
+ * @version 2.6.1
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} ?>
 
 <div style="max-width: 560px;padding: 20px;background: #ffffff;border-radius: 5px;margin:40px auto;font-family: Open Sans,Helvetica,Arial;font-size: 15px;color: #666;">
 
 	<div style="color: #444444;font-weight: normal;">
 		<div style="text-align: center;font-weight:600;font-size:26px;padding: 10px 0;border-bottom: solid 3px #eeeeee;">{site_name}</div>
-		
+
 		<div style="clear:both"></div>
 	</div>
-	
+
 	<div style="padding: 0 30px 30px 30px;border-bottom: 3px solid #eeeeee;">
 
 		<div style="padding: 30px 0;font-size: 24px;text-align: center;line-height: 40px;">We received a request to reset the password for your account. If you made this request, click the link below to change your password:</div>
 
 		<div style="padding: 10px 0 50px 0;text-align: center;"><a href="{password_reset_link}" style="background: #555555;color: #fff;padding: 12px 30px;text-decoration: none;border-radius: 3px;letter-spacing: 0.3px;">Reset your password</a></div>
-		
+
 		<div style="padding: 15px;background: #eee;border-radius: 3px;text-align: center;">If you didn't make this request, ignore this email or <a href="mailto:{admin_email}" style="color: #3ba1da;text-decoration: none;">report it to us</a>.</div>
-		
-	</div>
-	
-	<div style="color: #999;padding: 20px 30px">
-		
-		<div style="">Thank you!</div>
-		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
-		
+
 	</div>
 
-</div>
\ No newline at end of file
+	<div style="color: #999;padding: 20px 30px">
+
+		<div style="">Thank you!</div>
+		<div style="">The <a href="{site_url}" style="color: #3ba1da;text-decoration: none;">{site_name}</a> Team</div>
+
+	</div>
+
+</div>