diff --git a/phpBB/adm/style/acp_avatar_options_gravatar.html b/phpBB/adm/style/acp_avatar_options_gravatar.html
index 47422a6ecd..ad3891f0a4 100644
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -1,6 +1,6 @@
 <dl>
 	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index 9b98efd283..cad1dca9d8 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -12,7 +12,7 @@
 	</dl>
 	<dl>
 		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+		<dd><input type="email" id="msn" name="msn" value="{MSN}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
@@ -20,7 +20,7 @@
 	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
+		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index c26b48cb6d..61bfd630ff 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -55,7 +55,7 @@ function insert_single(user)
 <!-- IF S_EMAIL_SEARCH_ALLOWED -->
 	<dl>
 		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
-		<dd><input type="email" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
+		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
 	<dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
index 692f50cb9a..88e0e69f53 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
@@ -14,7 +14,7 @@ onload_functions.push(function() {
 
 <dl>
 	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
 </dl>
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 82490f202e..3578c29e8e 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -24,11 +24,11 @@
 	</dl>
 	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
-		<dd><input type="email" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
+		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="text" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
+		<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>