diff --git a/classes/Core/Course.php b/classes/Core/Course.php
index 9e58b4f5..19d41bd3 100644
--- a/classes/Core/Course.php
+++ b/classes/Core/Course.php
@@ -263,10 +263,10 @@ public function moowoodle_linked_course_panals() {
 						return $term->name;
 					}, $terms ) : [];
 					$course_name = implode( ' / ', $course_path );
-					$course_name .= ' - ' . esc_html__( get_the_title( $course_id ) );
+					$course_name .= ' - ' . esc_html( get_the_title( $course_id ) );
 					?>
 					<option value="<?php echo esc_attr( $course_id ); ?>" <?php selected( $course_id, $linked_course_id ); ?>>
-						<?php echo esc_html__( $course_name ) . ( ! empty( $course_short_name ) ? " ( " . esc_html__( $course_short_name ) . " )" : ''); ?>
+						<?php echo esc_html( $course_name ) . ( ! empty( $course_short_name ) ? " ( " . esc_html( $course_short_name ) . " )" : ''); ?>
 					</option>
 					<?php
 				}
@@ -313,4 +313,4 @@ public function save_product_meta_data( $product_id ) {
 
 		return $product_id;
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/Enrollment.php b/classes/Enrollment.php
index 56e278a6..f45a73b9 100644
--- a/classes/Enrollment.php
+++ b/classes/Enrollment.php
@@ -374,12 +374,12 @@ public function add_dates_with_product() {
 		
 		if ( $start_end_date ) {
 			if ( $startdate ) {
-				echo esc_html_e( "Start Date : ", 'moowoodle' ) . esc_html_e( gmdate( 'Y-m-d', $startdate ), 'moowoodle' );
+				echo esc_html__( "Start Date : ", 'moowoodle' ) . esc_html( gmdate( 'Y-m-d', $startdate );
 				print_r("<br>");
 			}
 
 			if ( $enddate ) {
-				echo esc_html_e( "End Date : ", 'moowoodle' ) . esc_html_e( gmdate( 'Y-m-d', $enddate ), 'moowoodle' );
+				echo esc_html__( "End Date : ", 'moowoodle' ) . esc_html( gmdate( 'Y-m-d', $enddate );
 			}
 		}
 	}
diff --git a/templates/emails/EnrollmentEmail.php b/templates/emails/EnrollmentEmail.php
index 03e977f0..41d6d7dc 100644
--- a/templates/emails/EnrollmentEmail.php
+++ b/templates/emails/EnrollmentEmail.php
@@ -18,8 +18,8 @@
 	<?php
 		if ( !empty($new_user_created) ) { ?>
 			<p>
-				<?php echo __( 'Username : ', 'moowoodle' ) . esc_html__( $user_details->data->user_login ) ; ?> <br>
-				<?php echo __( 'Password : ', 'moowoodle' ) . esc_html__( $password ) ;
+				<?php echo __( 'Username : ', 'moowoodle' ) . esc_html( $user_details->data->user_login ) ; ?> <br>
+				<?php echo __( 'Password : ', 'moowoodle' ) . esc_html( $password ) ;
 				delete_user_meta( $user_id, 'moowoodle_moodle_new_user_created' ); ?>
 			</p> 
 			<?php
diff --git a/templates/emails/plain/EnrollmentEmail.php b/templates/emails/plain/EnrollmentEmail.php
index 492a4182..6dd2fc8a 100644
--- a/templates/emails/plain/EnrollmentEmail.php
+++ b/templates/emails/plain/EnrollmentEmail.php
@@ -12,8 +12,8 @@
 $new_user_created = get_user_meta( $user_id, 'moowoodle_moodle_new_user_created', true );
 
 if ( !empty($new_user_created) ) {
-	echo __( 'Username : ', 'moowoodle' ) . esc_html__( $user_details->data->user_login ) . '\n\n';
-	echo __( 'Password : ', 'moowoodle' ) . esc_html__( $password ) . '\n\n';
+	echo __( 'Username : ', 'moowoodle' ) . esc_html( $user_details->data->user_login ) . '\n\n';
+	echo __( 'Password : ', 'moowoodle' ) . esc_html( $password ) . '\n\n';
 }
 
 echo __( 'To enroll and access your course please click on the course link given below :', 'moowoodle' ) . '\n\n';