diff --git a/app/src/helpers/dataStore.js b/app/src/helpers/dataStore.js
index c8e6a532..d6fe02bf 100644
--- a/app/src/helpers/dataStore.js
+++ b/app/src/helpers/dataStore.js
@@ -16,6 +16,10 @@ export default {
       state.domains = domains
     },
 
+    'ADD_DOMAINS' (state, { domain }) {
+      state.domains.push(domain)
+    },
+
     'SET_MAIN_DOMAIN' (state, response) {
       state.main_domain = response.current_main_domain
     },
@@ -102,8 +106,10 @@ export default {
 
     'POST' ({ state, commit }, { uri, data, storeKey = uri }) {
       return api.post(uri, data).then(responseData => {
-        const data = responseData[storeKey] ? responseData[storeKey] : responseData
-        commit('ADD_' + storeKey.toUpperCase(), data)
+        // FIXME api/domains returns null
+        if (responseData === null) responseData = data
+        responseData = responseData[storeKey] ? responseData[storeKey] : responseData
+        commit('ADD_' + storeKey.toUpperCase(), responseData)
         return state[storeKey]
       })
     },
diff --git a/app/src/locales/en.json b/app/src/locales/en.json
index cc45267c..fa549593 100644
--- a/app/src/locales/en.json
+++ b/app/src/locales/en.json
@@ -123,7 +123,10 @@
         "email_syntax": "Invalid email: Must be alphanumeric, underscore and dash characters only (e.g. someone@example.com, s0me-1@example.com)",
         "groupname_syntax": "Invalid group name: Must be alphanumeric, underscore and space characters only",
         "username_exists": "The user '{name}' already exists",
-        "username_syntax": "Invalid username: Must be lower-case alphanumeric and underscore characters only"
+        "username_syntax": "Invalid username: Must be lower-case alphanumeric and underscore characters only",
+        "domain_syntax": "Invalid domain name: Must be lower-case alphanumeric, dot and dash characters only",
+        "dynDomain_syntax": "Invalid domain name: Must be lower-case alphanumeric and dash characters only"
+
     },
     "form_input_example": "Example: %s",
     "from_to": "from %s to %s",
diff --git a/app/src/routes.js b/app/src/routes.js
index de5a0204..55bed698 100644
--- a/app/src/routes.js
+++ b/app/src/routes.js
@@ -2,7 +2,7 @@ import Home from './views/Home'
 import Login from './views/Login'
 import { UserList, UserCreate, UserInfo, UserEdit } from './views/user'
 import { GroupList, GroupCreate } from './views/group'
-import { DomainList } from './views/domain'
+import { DomainList, DomainAdd } from './views/domain'
 
 const routes = [
   { name: 'home', path: '/', component: Home },
@@ -93,6 +93,17 @@ const routes = [
         { name: 'domain-list', trad: 'domains' }
       ]
     }
+  },
+  {
+    name: 'domain-add',
+    path: '/domains/add',
+    component: DomainAdd,
+    meta: {
+      breadcrumb: [
+        { name: 'domain-list', trad: 'domains' },
+        { name: 'domain-add', trad: 'domain_add' }
+      ]
+    }
   }
 ]
 
diff --git a/app/src/views/domain/DomainAdd.vue b/app/src/views/domain/DomainAdd.vue
new file mode 100644
index 00000000..c2e581da
--- /dev/null
+++ b/app/src/views/domain/DomainAdd.vue
@@ -0,0 +1,169 @@
+<template lang="html">
+  <basic-form
+    :header="$t('domain_add')" :submit="$t('add')"
+    @submit.prevent="onSubmit"
+  >
+    <!-- DOMAIN -->
+    <b-form-radio
+      v-model="selected" name="domain-type" value="domain"
+      :class="domainIsVisible ? null : 'collapsed'"
+      :aria-expanded="domainIsVisible ? 'true' : 'false'"
+      aria-controls="collapse-domain"
+    >
+      {{ $t('domain_add_panel_with_domain') }}
+    </b-form-radio>
+
+    <b-collapse id="collapse-domain" :visible.sync="domainIsVisible">
+      <small v-html="$t('domain_add_dns_doc')" />
+
+      <b-form-group
+        label-cols="auto"
+        :label="$t('domain_name')" label-for="input-domain" label-tag="strong"
+      >
+        <b-input
+          id="input-domain" :placeholder="$t('placeholder.domain')"
+          aria-describedby="domain-feedback"
+          v-model="form.domain" :state="isValid.domain"
+          @input="validateDomainName($event)"
+        />
+
+        <b-form-invalid-feedback id="domain-feedback" :state="isValid.domain">
+          {{ this.error.domain }}
+        </b-form-invalid-feedback>
+      </b-form-group>
+    </b-collapse>
+
+    <!-- DYN DOMAIN -->
+    <b-form-radio
+      v-model="selected" name="domain-type" value="dynDomain"
+      :disabled="dynDnsForbiden"
+      :class="dynDomainIsVisible ? null : 'collapsed'"
+      :aria-expanded="dynDomainIsVisible ? 'true' : 'false'"
+      aria-controls="collapse-dynDomain"
+    >
+      {{ $t('domain_add_panel_without_domain') }}
+    </b-form-radio>
+
+    <b-collapse id="collapse-dynDomain" :visible.sync="dynDomainIsVisible">
+      <small>{{ $t('domain_add_dyndns_doc') }}</small>
+
+      <b-form-group
+        label-cols="auto"
+        :label="$t('domain_name')" label-for="input-dynDomain"
+      >
+        <adress-input-select
+          id="input-dynDomain" feedback-id="dynDomain-feedback"
+          v-model="form.dynDomain" :options="dynDomains"
+          :state="isValid.dynDomain" :placeholder="$t('myserver')"
+          separator="."
+          @input="validateDomainName($event)"
+        />
+
+        <b-form-invalid-feedback id="dynDomain-feedback" :state="isValid.dynDomain">
+          {{ this.error.dynDomain }}
+        </b-form-invalid-feedback>
+      </b-form-group>
+    </b-collapse>
+  </basic-form>
+</template>
+
+<script>
+import BasicForm from '@/components/BasicForm'
+import AdressInputSelect from '@/components/AdressInputSelect'
+
+export default {
+  name: 'GroupCreate',
+
+  data () {
+    return {
+      selected: '',
+      dynDomains: ['nohost.me', 'noho.st', 'ynh.fr'],
+      form: {
+        domain: '',
+        dynDomain: ['', 'nohost.me']
+      },
+      isValid: {
+        domainname: null,
+        dynDomainname: null
+      },
+      error: {
+        domain: '',
+        dynDomain: ''
+      }
+    }
+  },
+
+  computed: {
+    domains () {
+      return this.$store.state.data.domains
+    },
+
+    dynDnsForbiden () {
+      if (!this.domains) return true
+      return this.domains.some(domain => {
+        return this.dynDomains.some(dynDomain => domain.includes(dynDomain))
+      })
+    },
+
+    domainIsVisible () {
+      return this.selected === 'domain'
+    },
+
+    dynDomainIsVisible () {
+      return this.selected === 'dynDomain'
+    }
+  },
+
+  methods: {
+    onSubmit () {
+      const domainType = this.selected
+      this.validateDomainName(this.form[domainType])
+      if (this.isValid[domainType] === false) return
+
+      const query = {
+        uri: 'domains',
+        data: { domain: this.form[domainType] },
+        storeKey: 'domains'
+      }
+      if (domainType === 'dynDomain') {
+        query.uri += '?dyndns'
+        query.data.domain = query.data.domain.join('.')
+      }
+      this.$store.dispatch('POST', query).then(() => {
+        this.$router.push({ name: 'domain-list' })
+      }).catch(error => {
+        this.error[domainType] = error.message
+        this.isValid[domainType] = false
+      })
+    },
+
+    validateDomainName (name) {
+      const domainType = this.selected
+      const domainname = domainType === 'domain' ? name : name[0]
+      const regex = domainType === 'domain' ? '^[.a-z0-9-]+$' : '^[a-z0-9-]+$'
+      let error = ''
+      if (!domainname.match(regex)) {
+        error = this.$i18n.t(`form_errors.${domainType}_syntax`)
+      }
+      this.error[this.selected] = error
+      this.isValid[this.selected] = error === '' ? null : false
+    }
+  },
+
+  created () {
+    this.$store.dispatch('FETCH', { uri: 'domains' }).then(() => {
+      if (this.dynDnsForbiden) {
+        this.selected = 'domain'
+      }
+    })
+  },
+
+  components: {
+    AdressInputSelect,
+    BasicForm
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/app/src/views/domain/index.js b/app/src/views/domain/index.js
index ba3df3b9..19f029f7 100644
--- a/app/src/views/domain/index.js
+++ b/app/src/views/domain/index.js
@@ -1 +1,2 @@
 export { default as DomainList } from './DomainList'
+export { default as DomainAdd } from './DomainAdd'