diff --git a/html5_tools_forms/html5_tools_forms.module b/html5_tools_forms/html5_tools_forms.module
index 5ae43df..f32a00b 100644
--- a/html5_tools_forms/html5_tools_forms.module
+++ b/html5_tools_forms/html5_tools_forms.module
@@ -63,6 +63,17 @@ function html5_tools_forms_form_user_register_alter(&$form, &$form_state) {
 }
 
 /**
+ *  Implementation of hook_user().
+ */
+function html5_tools_forms_user($op, &$edit, &$account, $category = NULL) {
+  if ($op == 'form' && $category == 'account') {
+      $form['account']['mail']['#type'] = 'emailfield';
+  }
+  return $form;
+}
+
+ 
+/**
  * Add our own process function to cck number elements
  */
 function html5_tools_forms_elements() {