diff --git a/assets/components/tracking/connector/ConnectorsList.tsx b/assets/components/tracking/connector/ConnectorsList.tsx
index 3151de5..0df8af5 100644
--- a/assets/components/tracking/connector/ConnectorsList.tsx
+++ b/assets/components/tracking/connector/ConnectorsList.tsx
@@ -52,9 +52,9 @@ export function ConnectorsList({connectors, onDelete}: { connectors: ConnectorEl
                                     {t`You can stop using a connector at any time. To delete a connector, you must remove it from each linked Watchlist.
 The creation date corresponds to the date on which you consented to the creation of the connector and on which you declared in particular that you fulfilled the conditions of use of the supplier's API, waived the right of withdrawal and were of the minimum age to consent to these conditions.`}
                                      
-                                    <Typography.Link href={providersConfig[connector.provider].tosLink}>
-                                        {t`The Provider’s conditions are accessible by following this hyperlink.`}
-                                    </Typography.Link>
+                                    {providersConfig[connector.provider].tosLink && <Typography.Link href={providersConfig[connector.provider].tosLink}>
+                                {t`The Provider’s conditions are accessible by following this hyperlink.`}
+                                </Typography.Link>}
                                 </>
                             }/>
                         </Card>
diff --git a/assets/utils/api/connectors.ts b/assets/utils/api/connectors.ts
index a5aa58d..df3e7cf 100644
--- a/assets/utils/api/connectors.ts
+++ b/assets/utils/api/connectors.ts
@@ -6,7 +6,8 @@ export enum ConnectorProvider {
     Gandi = 'gandi',
     AutoDNS = 'autodns',
     Namecheap = 'namecheap',
-    'Name.com' = 'namecom'
+    'Name.com' = 'namecom',
+    EPP = 'epp'
 }
 
 export interface Connector {
diff --git a/assets/utils/providers/forms/DefaultConnectorFormItems.tsx b/assets/utils/providers/forms/DefaultConnectorFormItems.tsx
index c843c29..2c5271e 100644
--- a/assets/utils/providers/forms/DefaultConnectorFormItems.tsx
+++ b/assets/utils/providers/forms/DefaultConnectorFormItems.tsx
@@ -2,7 +2,7 @@ import {Checkbox, Form, Typography} from "antd"
 import {t} from "ttag"
 import React from "react"
 
-export default function DefaultConnectorFormItems({tosLink}: { tosLink: string }) {
+export default function DefaultConnectorFormItems({tosLink}: { tosLink?: string }) {
     return <>
         <Form.Item
             valuePropName='checked'
diff --git a/assets/utils/providers/forms/EppConnectorForm.tsx b/assets/utils/providers/forms/EppConnectorForm.tsx
new file mode 100644
index 0000000..4e6030d
--- /dev/null
+++ b/assets/utils/providers/forms/EppConnectorForm.tsx
@@ -0,0 +1,214 @@
+import React from "react"
+import {t} from "ttag"
+import {Alert, Card, Col, Form, Input, InputNumber, Row, Select, Switch} from "antd"
+
+export default function EppConnectorForm() {
+
+    return <>
+        <Alert
+            message={undefined}
+            type='info'
+            style={{marginBottom: '2em'}}
+        />
+
+        <Card size="small" title={t`Server configuration`} bordered={false}>
+            <Form.Item label={t`Protocol`}>
+                <Row gutter={16}>
+                    <Col span={12}>
+                        <Form.Item
+                            help={t`Version`}
+                            name={['authData', 'version']}
+                            initialValue='1.0'
+                            hasFeedback
+                            rules={[{required: true, message: t`Required`}]}
+                        >
+                            <Input autoComplete='off' required/>
+                        </Form.Item>
+                    </Col>
+
+                    <Col span={12}>
+                        <Form.Item
+                            help={t`Language`}
+                            name={['authData', 'language']}
+                            initialValue='en'
+                            hasFeedback
+                            rules={[{required: true, message: t`Required`}]}
+                        >
+                            <Input autoComplete='off' required/>
+                        </Form.Item>
+                    </Col>
+                </Row>
+            </Form.Item>
+
+            <Form.Item
+                label={t`Server`}
+                name={['authData', 'hostname']}
+                hasFeedback
+                rules={[{required: true, message: t`Required`}]}>
+                <Input addonAfter={
+                    <Form.Item
+                        name={['authData', 'port']}
+                        hasFeedback
+                        noStyle
+                        initialValue={700}
+                        rules={[{required: true, message: t`Required`}]}
+                    >
+                        <InputNumber autoComplete='off' required/>
+                    </Form.Item>
+                } placeholder='ssl://epp.nic.tld' autoComplete='off' required/>
+            </Form.Item>
+        </Card>
+
+
+        <Card size="small" title={t`Authentication`} bordered={false}>
+            <Form.Item label={t`Credentials`}>
+                <Row gutter={16}>
+                    <Col span={12}>
+                        <Form.Item
+                            name={['authData', 'auth', 'username']}
+                            hasFeedback
+                            rules={[{required: true, message: t`Required`}]}
+                        >
+                            <Input placeholder={t`Username`} autoComplete='off' required/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item
+                            name={['authData', 'auth', 'password']}
+                            hasFeedback
+                            rules={[{required: true, message: t`Required`}]}
+                        >
+                            <Input placeholder={t`Password`} autoComplete='off' required/>
+                        </Form.Item>
+                    </Col>
+                </Row>
+            </Form.Item>
+
+            <Form.Item label={t`TLS client certificate`}>
+                <Row gutter={16}>
+                    <Col span={12}>
+                        <Form.Item
+                            hasFeedback
+                            name={['authData', 'certificate_pem']}
+                            rules={[{
+                                required: false,
+                                validator: (_, value: string) =>
+                                    value.trim().startsWith('-----BEGIN CERTIFICATE-----') && value.trim().endsWith('-----END CERTIFICATE-----') ?
+                                        Promise.resolve() :
+                                        Promise.reject(new Error(t`The private key format is invalid`))
+                            }]}
+                        >
+                            <Input.TextArea rows={5} placeholder={`-----BEGIN CERTIFICATE-----
+...
+-----END CERTIFICATE-----`}/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item name={['authData', 'certificate_key']}>
+                            <Input.TextArea rows={5} placeholder={`-----BEGIN PRIVATE KEY-----
+...
+-----END PRIVATE KEY-----`}/>
+                        </Form.Item>
+                        <Form.Item name={['authData', 'ssl', 'passphrase']}>
+                            <Input placeholder={t`Private key passphrase (optional)`} autoComplete='off'/>
+                        </Form.Item>
+                    </Col>
+                </Row>
+            </Form.Item>
+
+            <Form.Item label={t`TLS configuration`}>
+                <Row gutter={16}>
+                    <Col span={8}>
+                        <Form.Item
+                            initialValue={true}
+                            help={t`Verify peer`}
+                            name={['authData', 'ssl', 'verify_peer']}
+                        >
+                            <Switch/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={8}>
+                        <Form.Item
+                            initialValue={true}
+                            help={t`Verify peer name`}
+                            name={['authData', 'ssl', 'verify_peer_name']}
+                        >
+                            <Switch/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={8}>
+                        <Form.Item
+                            initialValue={false}
+                            help={t`Allow self-signed certificates`}
+                            name={['authData', 'ssl', 'allow_self_signed']}
+                        >
+                            <Switch/>
+                        </Form.Item>
+                    </Col>
+                </Row>
+            </Form.Item>
+        </Card>
+
+        <Card size="small" title={t`Domain configuration`} bordered={false}>
+            <Form.Item
+                label={t`Registration period`}
+                initialValue={1}
+                hasFeedback
+                rules={[{
+                    required: true,
+                    message: t`Required`,
+                    validator: (_, v: number) => v > 0 && v < 100 ? Promise.resolve() : Promise.reject()
+                }]}
+                name={['authData', 'domain', 'period']}
+            >
+                <InputNumber addonAfter={
+                    <Form.Item name={['authData', 'domain', 'unit']} noStyle initialValue={'y'}>
+                        <Select style={{width: 100}}>
+                            <Select.Option value="y">{t`Year`}</Select.Option>
+                            <Select.Option value="m">{t`Month`}</Select.Option>
+                        </Select>
+                    </Form.Item>
+                } required/>
+            </Form.Item>
+
+            <Form.Item
+                label={t`Auth-Info Code`}
+                hasFeedback
+                rules={[{required: true, message: t`Required`}]}
+                name={['authData', 'domain', 'password']}
+            >
+                <Input required/>
+            </Form.Item>
+
+            <Form.Item label={t`NIC Handle`}>
+                <Row gutter={16}>
+                    <Col span={6}>
+                        <Form.Item
+                            hasFeedback
+                            required
+                            rules={[{required: true, message: t`Required`}]}
+                            name={['authData', 'domain', 'registrant']}>
+                            <Input placeholder={t`Registrant`} required/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={6}>
+                        <Form.Item name={['authData', 'domain', 'contacts', 'admin']}>
+                            <Input placeholder={t`Administrative`}/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={6}>
+                        <Form.Item name={['authData', 'domain', 'contacts', 'tech']}>
+                            <Input placeholder={t`Technical`}/>
+                        </Form.Item>
+                    </Col>
+                    <Col span={6}>
+                        <Form.Item name={['authData', 'domain', 'contacts', 'billing']}>
+                            <Input placeholder={t`Billing`}/>
+                        </Form.Item>
+                    </Col>
+                </Row>
+            </Form.Item>
+        </Card>
+
+    </>
+}
\ No newline at end of file
diff --git a/assets/utils/providers/index.tsx b/assets/utils/providers/index.tsx
index bfdb44a..8f2d5e1 100644
--- a/assets/utils/providers/index.tsx
+++ b/assets/utils/providers/index.tsx
@@ -6,6 +6,7 @@ import GandiConnectorForm from "./forms/GandiConnectorForm"
 import NamecheapConnectorForm from "./forms/NamecheapConnectorForm"
 import AutoDnsConnectorForm from "./forms/AutoDnsConnectorForm"
 import NamecomConnectorForm from "./forms/NamecomConnectorForm"
+import EppConnectorForm from "./forms/EppConnectorForm"
 
 export const formItemLayoutWithOutLabel = {
     wrapperCol: {
@@ -15,7 +16,7 @@ export const formItemLayoutWithOutLabel = {
 }
 
 export type ProviderConfig = {
-    tosLink: string
+    tosLink?: string
     form: ({form}: { form: FormInstance }) => React.ReactElement
 }
 
@@ -39,5 +40,8 @@ export const providersConfig: Record<ConnectorProvider, ProviderConfig> = {
     [ConnectorProvider["Name.com"]]: {
         tosLink: 'https://www.name.com/policies/',
         form: NamecomConnectorForm
+    },
+    [ConnectorProvider.EPP]: {
+        form: EppConnectorForm
     }
 }
diff --git a/src/Service/Connector/EppClientProvider.php b/src/Service/Connector/EppClientProvider.php
index 2422cf4..6a048df 100644
--- a/src/Service/Connector/EppClientProvider.php
+++ b/src/Service/Connector/EppClientProvider.php
@@ -136,6 +136,10 @@ class EppClientProvider extends AbstractProvider implements CheckDomainProviderI
      */
     private function connect(): void
     {
+        if ($this->eppClient->isConnected()) {
+            return;
+        }
+
         $conn = new eppConnection(false, null);
         $conn->setHostname($this->authData['hostname']);
         $conn->setVersion($this->authData['version']);