diff --git a/lib/cjs/components/form/EmailField.js b/lib/cjs/components/form/EmailField.js
index 6687c2b0..3da2c117 100644
--- a/lib/cjs/components/form/EmailField.js
+++ b/lib/cjs/components/form/EmailField.js
@@ -32,9 +32,7 @@ var yup_1 = require("yup");
 var TextField_1 = __importDefault(require("./TextField"));
 var EmailField = function (_a) {
     var _b = _a.name, name = _b === void 0 ? 'email' : _b, _c = _a.InputProps, InputProps = _c === void 0 ? {} : _c, _d = _a.validate, validate = _d === void 0 ? (0, yup_1.string)().email() : _d, otherTextFieldProps = __rest(_a, ["name", "InputProps", "validate"]);
-    var endAdornment = InputProps.endAdornment, otherInputProps = __rest(InputProps, ["endAdornment"]);
-    endAdornment = (react_1.default.createElement(material_1.InputAdornment, { position: 'end' },
-        react_1.default.createElement(icons_material_1.EmailOutlined, null)));
-    return (react_1.default.createElement(TextField_1.default, __assign({ type: 'email', name: name, validate: validate, InputProps: __assign({ endAdornment: endAdornment }, otherInputProps) }, otherTextFieldProps)));
+    return (react_1.default.createElement(TextField_1.default, __assign({ type: 'email', name: name, validate: validate, InputProps: __assign({ endAdornment: (react_1.default.createElement(material_1.InputAdornment, { position: 'end' },
+                react_1.default.createElement(icons_material_1.EmailOutlined, null))) }, InputProps) }, otherTextFieldProps)));
 };
 exports.default = EmailField;
diff --git a/lib/cjs/components/form/PasswordField.js b/lib/cjs/components/form/PasswordField.js
index f0d83c5a..42e7c6d0 100644
--- a/lib/cjs/components/form/PasswordField.js
+++ b/lib/cjs/components/form/PasswordField.js
@@ -32,7 +32,7 @@ var yup_1 = require("yup");
 var TextField_1 = __importDefault(require("./TextField"));
 var PasswordField = function (_a) {
     var _b = _a.name, name = _b === void 0 ? 'password' : _b, _c = _a.InputProps, InputProps = _c === void 0 ? {} : _c, _d = _a.validate, validate = _d === void 0 ? (0, yup_1.string)() : _d, otherTextFieldProps = __rest(_a, ["name", "InputProps", "validate"]);
-    return (react_1.default.createElement(TextField_1.default, __assign({ type: 'password', name: name, validate: validate, InputProps: __assign(__assign({}, InputProps), { endAdornment: (react_1.default.createElement(material_1.InputAdornment, { position: 'end' },
-                react_1.default.createElement(icons_material_1.Security, null))) }) }, otherTextFieldProps)));
+    return (react_1.default.createElement(TextField_1.default, __assign({ type: 'password', name: name, validate: validate, InputProps: __assign({ endAdornment: (react_1.default.createElement(material_1.InputAdornment, { position: 'end' },
+                react_1.default.createElement(icons_material_1.Security, null))) }, InputProps) }, otherTextFieldProps)));
 };
 exports.default = PasswordField;
diff --git a/lib/esm/components/form/EmailField.js b/lib/esm/components/form/EmailField.js
index 1fd35dc2..d5120886 100644
--- a/lib/esm/components/form/EmailField.js
+++ b/lib/esm/components/form/EmailField.js
@@ -27,9 +27,7 @@ import { string as YupString } from 'yup';
 import TextField from './TextField';
 var EmailField = function (_a) {
     var _b = _a.name, name = _b === void 0 ? 'email' : _b, _c = _a.InputProps, InputProps = _c === void 0 ? {} : _c, _d = _a.validate, validate = _d === void 0 ? YupString().email() : _d, otherTextFieldProps = __rest(_a, ["name", "InputProps", "validate"]);
-    var endAdornment = InputProps.endAdornment, otherInputProps = __rest(InputProps, ["endAdornment"]);
-    endAdornment = (React.createElement(InputAdornment, { position: 'end' },
-        React.createElement(EmailOutlinedIcon, null)));
-    return (React.createElement(TextField, __assign({ type: 'email', name: name, validate: validate, InputProps: __assign({ endAdornment: endAdornment }, otherInputProps) }, otherTextFieldProps)));
+    return (React.createElement(TextField, __assign({ type: 'email', name: name, validate: validate, InputProps: __assign({ endAdornment: (React.createElement(InputAdornment, { position: 'end' },
+                React.createElement(EmailOutlinedIcon, null))) }, InputProps) }, otherTextFieldProps)));
 };
 export default EmailField;
diff --git a/lib/esm/components/form/PasswordField.js b/lib/esm/components/form/PasswordField.js
index 161097a4..414b8b56 100644
--- a/lib/esm/components/form/PasswordField.js
+++ b/lib/esm/components/form/PasswordField.js
@@ -27,7 +27,7 @@ import { string as YupString } from 'yup';
 import TextField from './TextField';
 var PasswordField = function (_a) {
     var _b = _a.name, name = _b === void 0 ? 'password' : _b, _c = _a.InputProps, InputProps = _c === void 0 ? {} : _c, _d = _a.validate, validate = _d === void 0 ? YupString() : _d, otherTextFieldProps = __rest(_a, ["name", "InputProps", "validate"]);
-    return (React.createElement(TextField, __assign({ type: 'password', name: name, validate: validate, InputProps: __assign(__assign({}, InputProps), { endAdornment: (React.createElement(InputAdornment, { position: 'end' },
-                React.createElement(SecurityIcon, null))) }) }, otherTextFieldProps)));
+    return (React.createElement(TextField, __assign({ type: 'password', name: name, validate: validate, InputProps: __assign({ endAdornment: (React.createElement(InputAdornment, { position: 'end' },
+                React.createElement(SecurityIcon, null))) }, InputProps) }, otherTextFieldProps)));
 };
 export default PasswordField;