diff --git a/pom.xml b/pom.xml
index fd34151d..7cdde2cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,11 @@
 			<artifactId>wicket-core</artifactId>
 			<version>6.7.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-extensions</artifactId>
+			<version>6.7.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-auth-roles</artifactId>
diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
index cee247ac..7c02e568 100644
--- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
+++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
@@ -5,13 +5,14 @@ import java.util.Arrays;
 import javax.inject.Inject;
 
 import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
 import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
 import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.EmailTextField;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.StatelessForm;
+import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -92,7 +93,12 @@ public class RegisterPanel extends Panel {
 						}));
 		form.add(new PasswordTextField("password", MF.m(model, p.getPassword()))
 				.setResetPassword(false).add(StringValidator.minimumLength(6)));
-		form.add(new EmailTextField("email", MF.m(model, p.getEmail())));
+		form.add(new TextField<String>("email", MF.m(model, p.getEmail())) {
+			@Override
+			protected String getInputType() {
+				return "email";
+			}
+		}.add(RfcCompliantEmailAddressValidator.getInstance()));
 		form.add(new CheckBox("import", MF.m(model, p.isGoogleImport())));
 
 	}