1 files changed, 10 insertions, 15 deletions

diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 0e3ac6b10..a1a353e57 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -3,11 +3,10 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { Link } from 'react-router';
-
-// import { Link } from 'react-router';
+import { Input } from '@meetfranz/forms';
 
 import Form from '../../../lib/Form';
-import Input from '../../ui/Input';
+// import Input from '../../ui/Input';
 import Button from '../../ui/Button';
 import Radio from '../../ui/Radio';
 import Infobox from '../../ui/Infobox';
@@ -39,13 +38,12 @@ const messages = defineMessages({
   },
 });
 
-export default @observer class EditServiceForm extends Component {
+export default @observer class EditUserForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
-    isEnterprise: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -68,7 +66,6 @@ export default @observer class EditServiceForm extends Component {
       // user,
       status,
       form,
-      isEnterprise,
       isSaving,
     } = this.props;
     const { intl } = this.context;
@@ -98,23 +95,21 @@ export default @observer class EditServiceForm extends Component {
             )}
             <h2>{intl.formatMessage(messages.headlineAccount)}</h2>
             <div className="grid__row">
-              <Input field={form.$('firstname')} focus />
-              <Input field={form.$('lastname')} />
+              <Input {...form.$('firstname').bind()} focus />
+              <Input {...form.$('lastname').bind()} />
             </div>
-            <Input field={form.$('email')} />
-            {!isEnterprise && (
-              <Radio field={form.$('accountType')} />
-            )}
-            {!isEnterprise && form.$('accountType').value === 'company' && (
+            <Input {...form.$('email').bind()} />
+            <Radio field={form.$('accountType')} />
+            {form.$('accountType').value === 'company' && (
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
             <Input
-              field={form.$('oldPassword')}
+              {...form.$('oldPassword').bind()}
               showPasswordToggle
             />
             <Input
-              field={form.$('newPassword')}
+              {...form.$('newPassword').bind()}
               showPasswordToggle
               scorePassword
             />