diff --git a/e107_core/shortcodes/batch/contact_shortcodes.php b/e107_core/shortcodes/batch/contact_shortcodes.php
index c40a8a2ab..15a5a400f 100644
--- a/e107_core/shortcodes/batch/contact_shortcodes.php
+++ b/e107_core/shortcodes/batch/contact_shortcodes.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -92,8 +92,8 @@ class contact_shortcodes extends e_shortcode
 	{
 		$userName = deftrue('USERNAME');
 
-		return "<input type='text'   id='contactName' title='Your full name' name='author_name' required='required' size='30' class='tbox form-control' value=\"".varset($_POST['author_name'],$userName)."\" />";
-		
+		return "<input type='text'   id='contactName' title='".LANCONTACT_17."' name='author_name' required='required' size='30' class='tbox form-control' value=\"".varset($_POST['author_name'],$userName)."\" />";
+
 	}
 
 
@@ -103,14 +103,14 @@ class contact_shortcodes extends e_shortcode
 		$userEmail = deftrue('USEREMAIL');
 		$disabled = (!empty($userEmail)) ? 'readonly' : ''; // don't allow change from a verified email address.
 
-		return "<input type='email'   ".$disabled." id='contactEmail' title='a valid email address' name='email_send' required='required' size='30' class='tbox form-control' value='".(vartrue($_POST['email_send']) ? $_POST['email_send'] : USEREMAIL)."' />";
+		return "<input type='email'   ".$disabled." id='contactEmail' title='".LANCONTACT_18."' name='email_send' required='required' size='30' class='tbox form-control' value='".(vartrue($_POST['email_send']) ? $_POST['email_send'] : USEREMAIL)."' />";
 	}
 	
 	
 	
 	function sc_contact_subject($parm='')
 	{
-		return "<input type='text' title='the subject of your enquiry' name='subject' required='required' size='30' class='tbox form-control' value=\"".varset($_POST['subject'])."\" />";
+		return "<input type='text' title='".LANCONTACT_19."' name='subject' required='required' size='30' class='tbox form-control' value=\"".varset($_POST['subject'])."\" />";
 	}
 	
 	
@@ -125,7 +125,7 @@ class contact_shortcodes extends e_shortcode
 			$size = 'input-xxlarge';	
 		}
 		
-		return "<textarea cols='{$cols}'  id='contactBody' rows='{$rows}' name='body' required='required' class='tbox {$size} form-control'>".stripslashes(varset($_POST['body']))."</textarea>";
+		return "<textarea cols='{$cols}'  id='contactBody' rows='{$rows}' title='".LANCONTACT_20."' name='body' required='required' class='tbox {$size} form-control'>".stripslashes(varset($_POST['body']))."</textarea>";
 	}
 	
 	
diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index b172ed3b8..259fe5414 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -1,5 +1,14 @@
 <?php
-// $Id$
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Contact Template
+ */
+ // $Id$
 
 if (!defined('e107_INIT')) { exit; }
 
@@ -30,17 +39,17 @@ $CONTACT_TEMPLATE['info'] = "
 $CONTACT_TEMPLATE['menu'] =  '
 	<div class="contactMenuForm">
 		<div class="control-group form-group">
-			<label >Name</label>
-   			 {CONTACT_NAME}
+			<label for="contactName">'.LANCONTACT_03.'</label>
+				{CONTACT_NAME}
 		 </div>
 		 
 		<div class="control-group form-group">
-			<label class="control-label" for="contactEmail">Email</label>
+			<label class="control-label" for="contactEmail">'.LANCONTACT_04.'</label>
 				{CONTACT_EMAIL}
 		</div>
 		<div class="control-group form-group">
-			<label>Comments</label>
-			{CONTACT_BODY=rows=5&cols=30}							
+			<label for="contactBody" >'.LANCONTACT_06.'</label>
+				{CONTACT_BODY=rows=5&cols=30}
 		</div>
 		{CONTACT_SUBMIT_BUTTON}
 	</div>       
@@ -60,29 +69,29 @@ $CONTACT_TEMPLATE['menu'] =  '
 	// In this case (see contact.php) e107::getScBatch('contact')->wrapper('contact/form')
 	// Only one Option is used - WRAPPER > SC_STYLE
 
-	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] 			= "<div class='control-group form-group'><label>".LAN_ENTER_CODE."</label> {---}";
+	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] 			= "<div class='control-group form-group'><label for='code-verify'>".LAN_ENTER_CODE."</label> {---}"; 
 	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] 	= "{---}</div>";
 	$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] 			= "<div class='control-group form-group'>{---}".LANCONTACT_07."</div>";
-	$CONTACT_WRAPPER['form']['CONTACT_PERSON']				= "<div class='control-group form-group'><label>".LANCONTACT_14."</label>{---}</div>";
+	$CONTACT_WRAPPER['form']['CONTACT_PERSON']				= "<div class='control-group form-group'><label for='contactPerson'>".LANCONTACT_14."</label>{---}</div>";
 
 	$CONTACT_TEMPLATE['form'] = "
 	<form action='".e_SELF."' method='post' id='contactForm' >
 
 	{CONTACT_PERSON}
-	<div class='control-group form-group'><label>".LANCONTACT_03."</label>
+	<div class='control-group form-group'><label for='contactName'>".LANCONTACT_03."</label>
 		{CONTACT_NAME}
 	</div>
-	<div class='control-group form-group'><label>".LANCONTACT_04."</label>
+	<div class='control-group form-group'><label for='contactEmail'>".LANCONTACT_04."</label>
 		{CONTACT_EMAIL}
 	</div>
-	<div class='control-group form-group'><label>".LANCONTACT_05."</label>
+	<div class='control-group form-group'><label for='contactSubject'>".LANCONTACT_05."</label>
 		{CONTACT_SUBJECT}
 	</div>
 
 		{CONTACT_EMAIL_COPY}
 
-	<div class='control-group form-group'><label>".LANCONTACT_06."</label>
-        {CONTACT_BODY}
+	<div class='control-group form-group'><label for='contactBody'>".LANCONTACT_06."</label>
+		{CONTACT_BODY}
 	</div>
 
 	{CONTACT_IMAGECODE}
@@ -100,4 +109,4 @@ $CONTACT_TEMPLATE['menu'] =  '
 
 	
 
-?>
\ No newline at end of file
+?>
diff --git a/e107_languages/English/lan_contact.php b/e107_languages/English/lan_contact.php
index 4f579856b..da6852ce5 100644
--- a/e107_languages/English/lan_contact.php
+++ b/e107_languages/English/lan_contact.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -15,23 +15,27 @@
  */
 
 
-define('LANCONTACT_00', 'Contact Us');
+define("LANCONTACT_00", "Contact Us");
 define("LANCONTACT_01", "Contact Details");
 define("LANCONTACT_02", "Contact Form");
-define("LANCONTACT_03", "Enter your name:");
-define("LANCONTACT_04", "Enter your e-mail address:");
-define("LANCONTACT_05", "Message subject:");
-define("LANCONTACT_06", "Message:");
+define("LANCONTACT_03", "Enter your name");
+define("LANCONTACT_04", "Enter your e-mail address");
+define("LANCONTACT_05", "Message subject");
+define("LANCONTACT_06", "Message");
 define("LANCONTACT_07", "Email a copy of this message to your own address ");
 define("LANCONTACT_08", "Send");
 define("LANCONTACT_09", "Your message was sent.");
 define("LANCONTACT_10", "There was a problem sending your message.");
-define("LANCONTACT_11", "Your email address doesn't appear to be valid.\\nPlease check it and try again.");
+define("LANCONTACT_11", "Your email address does not appear to be valid.\\nPlease check it and try again.");
 define("LANCONTACT_12", "Your message is too short.");
 define("LANCONTACT_13", "Please include a subject.");
 
-define("LANCONTACT_14", "Send message to:");
+define("LANCONTACT_14", "Send message to");
 define("LANCONTACT_15", "Incorrect code entered");
 define("LANCONTACT_16", "You must be [registered] and signed-in to use this form.");
+define("LANCONTACT_17", "Please enter your name.");
+define("LANCONTACT_18", "Please enter your e-mail address.");
+define("LANCONTACT_19", "Please enter the subject for your e-mail.");
+define("LANCONTACT_20", "Please enter your message for us.");