diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 9b1accb..5562d1d 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -377,7 +377,7 @@ function system_element_info() {
   $types['email'] = array(
     '#input' => TRUE,
     '#size' => 60,
-    '#maxlength' => 128,
+    '#maxlength' => EMAIL_MAX_LENGTH,
     '#autocomplete_path' => FALSE,
     '#process' => array('ajax_process_form'),
     '#element_validate' => array('form_validate_email'),