diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php
index 5a4149e89b..4f553071ba 100644
--- a/app/contacts/contact_email_edit.php
+++ b/app/contacts/contact_email_edit.php
@@ -262,7 +262,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
 	echo "	".$text['label-email_address']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='email' name='email_address' maxlength='255' value=\"".$email_address."\">\n";
+	echo "	<input class='formfld' type='text' name='email_address' maxlength='255' value=\"".$email_address."\">\n";
 	echo "<br />\n";
 	echo $text['description-email_address']."\n";
 	echo "</td>\n";
diff --git a/themes/default/template.php b/themes/default/template.php
index 8c5065e303..558d15a5f8 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -786,13 +786,11 @@
 	input[type=text].txt,
 	input[type=number].txt,
 	input[type=password].txt,
-	input[type=email].txt,
 	select.formfld,
 	textarea.formfld,
 	input[type=text].formfld,
 	input[type=number].formfld,
-	input[type=password].formfld,
-	input[type=email].formfld {
+	input[type=password].formfld {
 		font-family: <?php echo ($_SESSION['theme']['input_text_font']['text'] != '') ? $_SESSION['theme']['input_text_font']['text'] : 'Arial'; ?>;
 		font-size: <?php echo ($_SESSION['theme']['input_text_size']['text'] != '') ? $_SESSION['theme']['input_text_size']['text'] : '12px'; ?>;
 		color: <?php echo ($_SESSION['theme']['input_text_color']['text'] != '') ? $_SESSION['theme']['input_text_color']['text'] : '#000000'; ?>;
@@ -833,12 +831,10 @@
 	input[type=text].txt,
 	input[type=number].txt,
 	input[type=password].txt,
-	input[type=email].txt,
 	textarea.formfld,
 	input[type=text].formfld,
 	input[type=number].formfld,
-	input[type=password].formfld,
-	input[type=email].formfld {
+	input[type=password].formfld {
 		transition: width 0.25s;
 		-moz-transition: width 0.25s;
 		-webkit-transition: width 0.25s;
@@ -854,12 +850,10 @@
 	input[type=text].txt:hover,
 	input[type=number].txt:hover,
 	input[type=password].txt:hover,
-	input[type=email].txt:hover,
 	textarea.formfld:hover,
 	input[type=text].formfld:hover,
 	input[type=number].formfld:hover,
-	input[type=password].formfld:hover,
-	input[type=email].formfld:hover {
+	input[type=password].formfld:hover {
 		border-color: <?php echo ($_SESSION['theme']['input_border_color_hover']['text'] != '') ? $_SESSION['theme']['input_border_color_hover']['text'] : '#c0c0c0'; ?>;
 		}
 
@@ -867,12 +861,10 @@
 	input[type=text].txt:focus,
 	input[type=number].txt:focus,
 	input[type=password].txt:focus,
-	input[type=email].txt:focus,
 	textarea.formfld:focus,
 	input[type=text].formfld:focus,
 	input[type=number].formfld:focus,
-	input[type=password].formfld:focus,
-	input[type=email].formfld:focus {
+	input[type=password].formfld:focus {
 		border-color: <?php echo ($_SESSION['theme']['input_border_color_focus']['text'] != '') ? $_SESSION['theme']['input_border_color_focus']['text'] : '#c0c0c0'; ?>;
 		/* first clear */
 		-webkit-box-shadow: none;