diff --git wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/attendee-visa.php wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/attendee-visa.php
index 172ee7c5..a1956cda 100644
--- wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/attendee-visa.php
+++ wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/attendee-visa.php
@@ -4,18 +4,25 @@
  */
 class WordCamp_Docs_Template_Attendee_Visa implements WordCamp_Docs_Template {
 	public function form( $data ) {
+		$wordcamp = get_wordcamp_post();
+		$start_date = ! empty( $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] ) ? date( 'j F Y', $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] ) : '';
+		$end_date = ! empty( $wordcamp->meta['End Date (YYYY-mm-dd)'][0] ) ? date( 'j F Y', $wordcamp->meta['End Date (YYYY-mm-dd)'][0] ) : $start_date;
+		$wc_location = ! empty( $wordcamp->meta['Location'][0] ) ? $wordcamp->meta['Location'][0] : '';
+		$org_name = ! empty( $wordcamp->meta['Organizer Name'][0] ) ? $wordcamp->meta['Organizer Name'][0] : '';
+		$wc_name = ! empty ( $wordcamp->post_title ) ? $wordcamp->post_title : '';
+		
 		$data = wp_parse_args( $data, array(
 			'attendee_first_name' => '',
 			'attendee_last_name' => '',
 			'country_of_residency' => '',
 			'passport_number' => '',
 
-			'wordcamp_name' => '',
-			'wordcamp_location' => '',
-			'wordcamp_date_start' => '',
-			'wordcamp_date_end' => '',
+			'wordcamp_name' => $wc_name,
+			'wordcamp_location' => $wc_location,
+			'wordcamp_date_start' => $start_date,
+			'wordcamp_date_end' => $end_date,
 
-			'organizer_name' => '',
+			'organizer_name' => $org_name,
 			'organizer_contacts' => '',
 		) );
 		?>
@@ -41,7 +48,8 @@ class WordCamp_Docs_Template_Attendee_Visa implements WordCamp_Docs_Template {
 			clear: both;
 		}
 		</style>
-
+		
+		<h2>Attendee Visa Letter</h2>
 		<div class="wcorg-docs-form">
 			<label><?php _e( 'Attendee First Name:', 'wordcamporg' ); ?></label>
 			<input name="attendee_first_name" value="<?php echo esc_attr( $data['attendee_first_name'] ); ?>" />
diff --git wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/speaker-visa.php wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/speaker-visa.php
index a8a77dea..37fea32b 100644
--- wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/speaker-visa.php
+++ wordcamp.org/public_html/wp-content/plugins/wordcamp-docs/templates/speaker-visa.php
@@ -4,18 +4,25 @@
  */
 class WordCamp_Docs_Template_Speaker_Visa implements WordCamp_Docs_Template {
 	public function form( $data ) {
+		$wordcamp = get_wordcamp_post();
+		$start_date = ! empty( $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] ) ? date( 'j F Y', $wordcamp->meta['Start Date (YYYY-mm-dd)'][0] ) : '';
+		$end_date = ! empty( $wordcamp->meta['End Date (YYYY-mm-dd)'][0] ) ? date( 'j F Y', $wordcamp->meta['End Date (YYYY-mm-dd)'][0] ) : $start_date;
+		$wc_location = ! empty( $wordcamp->meta['Location'][0] ) ? $wordcamp->meta['Location'][0] : '';
+		$org_name = ! empty( $wordcamp->meta['Organizer Name'][0] ) ? $wordcamp->meta['Organizer Name'][0] : '';
+		$wc_name = ! empty ( $wordcamp->post_title ) ? $wordcamp->post_title : '';
+		
 		$data = wp_parse_args( $data, array(
-			'attendee_first_name' => '',
-			'attendee_last_name' => '',
+			'speaker_first_name' => '',
+			'speaker_last_name' => '',
 			'country_of_residency' => '',
 			'passport_number' => '',
 
-			'wordcamp_name' => '',
-			'wordcamp_location' => '',
-			'wordcamp_date_start' => '',
-			'wordcamp_date_end' => '',
+			'wordcamp_name' => $wc_name,
+			'wordcamp_location' => $wc_location,
+			'wordcamp_date_start' => $start_date,
+			'wordcamp_date_end' => $end_date,
 
-			'organizer_name' => '',
+			'organizer_name' => $org_name,
 			'organizer_contacts' => '',
 		) );
 		?>
@@ -42,12 +49,13 @@ class WordCamp_Docs_Template_Speaker_Visa implements WordCamp_Docs_Template {
 		}
 		</style>
 
+		<h2>Speaker Visa Letter</h2>
 		<div class="wcorg-docs-form">
 			<label><?php _e( 'Speaker First Name:', 'wordcamporg' ); ?></label>
-			<input name="attendee_first_name" value="<?php echo esc_attr( $data['attendee_first_name'] ); ?>" />
+			<input name="speaker_first_name" value="<?php echo esc_attr( $data['speaker_first_name'] ); ?>" />
 
 			<label><?php _e( 'Speaker Last Name:', 'wordcamporg' ); ?></label>
-			<input name="attendee_last_name" value="<?php echo esc_attr( $data['attendee_last_name'] ); ?>" />
+			<input name="speaker_last_name" value="<?php echo esc_attr( $data['speaker_last_name'] ); ?>" />
 
 			<label><?php _e( 'Country of Residency:', 'wordcamporg' ); ?></label>
 			<input name="country_of_residency" value="<?php echo esc_attr( $data['country_of_residency'] ); ?>" />
@@ -163,7 +171,7 @@ h2 {
 
 		<p>To Whom It May Concern:</p>
 
-		<p>This letter is to confirm that <?php echo esc_html( $data['attendee_first_name'] ); ?> <?php echo esc_html( $data['attendee_last_name'] ); ?>
+		<p>This letter is to confirm that <?php echo esc_html( $data['speaker_first_name'] ); ?> <?php echo esc_html( $data['speaker_last_name'] ); ?>
 		<?php echo esc_html( $data['country_of_residency'] ); ?> passport number <?php echo esc_html( $data['passport_number'] ); ?>,
 		has been invited to speak at <?php echo esc_html( $data['wordcamp_name'] ); ?>, a community-organized event focusing on WordPress
 		development and technology.</p>
@@ -171,7 +179,7 @@ h2 {
 		<p>WordPress is a web software you can use to create a beautiful website or blog. The core software is built by hundreds of community
 		volunteers. The mission of the WordPress open source project is to democratize publishing through Open Source, GPL software.</p>
 
-		<p>To fulfill speaking duties at <?php echo esc_html( $data['wordcamp_name'] ); ?>, <?php echo esc_html( $data['attendee_first_name'] ); ?>
+		<p>To fulfill speaking duties at <?php echo esc_html( $data['wordcamp_name'] ); ?>, <?php echo esc_html( $data['speaker_first_name'] ); ?>
 		will need to be in <?php echo esc_html( $data['wordcamp_location'] ); ?> from <?php echo esc_html( $data['wordcamp_date_start'] ); ?>
 		through <?php echo esc_html( $data['wordcamp_date_end'] ); ?>.
 
@@ -196,8 +204,8 @@ h2 {
 	public function sanitize( $input ) {
 		$output = array();
 		foreach ( array(
-			'attendee_first_name',
-			'attendee_last_name',
+			'speaker_first_name',
+			'speaker_last_name',
 			'country_of_residency',
 			'passport_number',
 			'wordcamp_name',