diff --git a/assets/utils/providers/forms/EppConnectorForm.tsx b/assets/utils/providers/forms/EppConnectorForm.tsx
index 3c548ac..0a21eb4 100644
--- a/assets/utils/providers/forms/EppConnectorForm.tsx
+++ b/assets/utils/providers/forms/EppConnectorForm.tsx
@@ -12,7 +12,9 @@ import {
     PlusOutlined,
     SignatureOutlined,
     ToolOutlined,
-    UserOutlined
+    UserOutlined,
+    ShopOutlined,
+    ShoppingOutlined
 } from "@ant-design/icons"
 
 const DynamicKeyValueList = ({name, label, initialValue, keyPlaceholder, valuePlaceholder}: {
@@ -225,7 +227,7 @@ export default function EppConnectorForm() {
 
             <Form.Item label={t`NIC Handle`}>
                 <Row gutter={16}>
-                    <Col span={6}>
+                    <Col span={4}>
                         <Form.Item
                             hasFeedback
                             required
@@ -234,21 +236,31 @@ export default function EppConnectorForm() {
                             <Input prefix={<SignatureOutlined/>} placeholder={t`Registrant`} required/>
                         </Form.Item>
                     </Col>
-                    <Col span={6}>
+                    <Col span={4}>
                         <Form.Item name={['authData', 'domain', 'contacts', 'admin']}>
                             <Input prefix={<IdcardOutlined/>} placeholder={t`Administrative`}/>
                         </Form.Item>
                     </Col>
-                    <Col span={6}>
+                    <Col span={4}>
                         <Form.Item name={['authData', 'domain', 'contacts', 'tech']}>
                             <Input prefix={<ToolOutlined/>} placeholder={t`Technical`}/>
                         </Form.Item>
                     </Col>
-                    <Col span={6}>
+                    <Col span={4}>
                         <Form.Item name={['authData', 'domain', 'contacts', 'billing']}>
                             <Input prefix={<DollarOutlined/>} placeholder={t`Billing`}/>
                         </Form.Item>
                     </Col>
+                    <Col span={4}>
+                        <Form.Item name={['authData', 'domain', 'contacts', 'onsite']}>
+                            <Input prefix={<ShopOutlined />} placeholder={t`Onsite`}/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={4}>
+                        <Form.Item name={['authData', 'domain', 'contacts', 'reseller']}>
+                            <Input prefix={<ShoppingOutlined />} placeholder={t`Reseller`}/>
+                        </Form.Item>
+                    </Col>
                 </Row>
             </Form.Item>
         </Card>
diff --git a/src/Service/Connector/EppClientProvider.php b/src/Service/Connector/EppClientProvider.php
index 6e1217d..45aba12 100644
--- a/src/Service/Connector/EppClientProvider.php
+++ b/src/Service/Connector/EppClientProvider.php
@@ -44,7 +44,7 @@ class EppClientProvider extends AbstractProvider implements CheckDomainProviderI
 
         $this->eppClient->request(new eppHelloRequest());
 
-        $contacts = [$this->authData['domain']['registrant']];
+        $contacts = [new eppContactHandle($this->authData['domain']['registrant'], eppContactHandle::CONTACT_TYPE_REGISTRANT)];
         foreach ($this->authData['domain']['contacts'] as $role => $roid) {
             $contacts[] = new eppContactHandle($roid, $role);
         }