diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php
index 2624d07247b..385655d3626 100644
--- a/includes/class-wc-countries.php
+++ b/includes/class-wc-countries.php
@@ -953,10 +953,11 @@ class WC_Countries {
 		if ( $type == 'billing_' ) {
 
 			$address_fields['billing_email'] = array(
-				'label'    => __( 'Email Address', 'woocommerce' ),
-				'required' => true,
-				'class'    => array( 'form-row-first' ),
-				'validate' => array( 'email' ),
+				'label'		=> __( 'Email Address', 'woocommerce' ),
+				'required'	=> true,
+				'type'		=> 'email',
+				'class'		=> array( 'form-row-first' ),
+				'validate'	=> array( 'email' ),
 			);
 
 			$address_fields['billing_phone'] = array(
diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php
index 014f6c2b8ba..4a0861996df 100644
--- a/includes/wc-template-functions.php
+++ b/includes/wc-template-functions.php
@@ -1770,6 +1770,23 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
 
 				$field .= '</p>' . $after;
 
+				break;
+			case 'email' :
+
+				$field = '<p class="form-row ' . esc_attr( implode( ' ', $args['class'] ) ) .'" id="' . esc_attr( $args['id'] ) . '_field">';
+
+				if ( $args['label'] ) {
+					$field .= '<label for="' . esc_attr( $args['id'] ) . '" class="' . esc_attr( implode( ' ', $args['label_class'] ) ) .'">' . $args['label'] . $required . '</label>';
+				}
+
+				$field .= '<input type="email" class="input-text ' . esc_attr( implode( ' ', $args['input_class'] ) ) .'" name="' . esc_attr( $key ) . '" id="' . esc_attr( $args['id'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" '.$args['maxlength'].' value="' . esc_attr( $value ) . '" ' . implode( ' ', $custom_attributes ) . ' />';
+
+				if ( $args['description'] ) {
+					$field .= '<span class="description">' . esc_attr( $args['description'] ) . '</span>';
+				}
+
+				$field .= '</p>' . $after;
+
 				break;
 			case 'select' :