diff --git a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py
index 9027dd24..d76b0bdb 100644
--- a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py
+++ b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from django.forms.fields import EmailField
-from django.forms.widgets import TextInput
 from django.utils.translation import gettext_lazy as _
 
 from fobi.base import FormFieldPlugin, get_theme
@@ -46,14 +44,14 @@ class EmailRepeatInputPlugin(FormFieldPlugin):
             "widget": EmailRepeatWidget(attrs=widget_attrs),
         }
 
-        # if self.data.max_length:
-        #     try:
-        #         field_kwargs["max_length"] = int(self.data.max_length)
-        #     except ValueError:
-        #         field_kwargs["max_length"] = None
-        # else:
-        #     field_kwargs["max_length"] = None
-        #
-        # field_kwargs["min_length"] = None
+        if self.data.max_length:
+            try:
+                field_kwargs["max_length"] = int(self.data.max_length)
+            except ValueError:
+                field_kwargs["max_length"] = None
+        else:
+            field_kwargs["max_length"] = None
+
+        field_kwargs["min_length"] = None
 
         return [(self.data.name, EmailRepeatField, field_kwargs)]
diff --git a/src/fobi/reusable/email_repeat/field.py b/src/fobi/reusable/email_repeat/field.py
index ee97244f..04dac566 100644
--- a/src/fobi/reusable/email_repeat/field.py
+++ b/src/fobi/reusable/email_repeat/field.py
@@ -54,10 +54,10 @@ class EmailRepeatField(forms.MultiValueField):
 
     widget = EmailRepeatWidget
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         fields = (
-            forms.EmailField(),
-            forms.EmailField(),
+            forms.EmailField(max_length=max_length, min_length=min_length),
+            forms.EmailField(max_length=max_length, min_length=min_length),
         )
         super().__init__(fields, *args, **kwargs)