diff --git a/components/api-server/config/public-url.js b/components/api-server/config/public-url.js
index 7af7e87..8488376 100644
--- a/components/api-server/config/public-url.js
+++ b/components/api-server/config/public-url.js
@@ -40,7 +40,8 @@ const WWW_PATH = '/www';
 async function publicUrlToService (config) {
   const isDnsLess = config.get('dnsLess:isActive');
   const publicUrl = config.get('dnsLess:publicUrl');
-  if (isDnsLess && publicUrl != null) {
+  const customPublicUrl = !config.get('dnsLess:customPublicUrl');
+  if (customPublicUrl && isDnsLess && publicUrl != null) {
     config.set('service', {
       api: buildUrl(publicUrl, '/{username}/'),
       register: buildUrl(publicUrl, path.join(REG_PATH, '/')),
diff --git a/components/register/src/business/dataservers.js b/components/register/src/business/dataservers.js
index b916999..f91df92 100644
--- a/components/register/src/business/dataservers.js
+++ b/components/register/src/business/dataservers.js
@@ -45,8 +45,8 @@ function getHostings() {
             hostings: {
               hosting1: {
                 url: home,
-                name: 'Pryv.io',
-                description: 'Self hosted',
+                name: 'Switzerland',
+                description: 'Infomaniak',
                 available: true,
                 availableCore: publicUrl
               }
diff --git a/configs/api.yml b/configs/api.yml
index 59dc830..51339b8 100644
--- a/configs/api.yml
+++ b/configs/api.yml
@@ -1,3 +1,5 @@
+hds:
+  defaultAuthUrl: https://healthdatasafe.github.io/app-web-auth3-hds/access/access.html
 dnsLess:
   publicUrl: http://localhost:3000/ # the "Public" URL to reach the service, you need to change this if you use a third party SSL service such as NGNIX.
 http:
diff --git a/package.json b/package.json
index e133ed4..e5dd38a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "api": "LOGS=info NODE_ENV=production ./components/api-server/bin/server --config ./configs/api.yml",
     "apibackloop": "LOGS=info NODE_ENV=production ./components/api-server/bin/server --config ./configs/api-backloop.yml",
     "database": "DEVELOPMENT=true scripts/start-mongo",
-    "mail": "cd service-mail ; ./bin/server",
+    "mail": "cd service-mail ; ./bin/server --config=../configs/mail-config.yml",
     "pryv": "npm run database >> ./var-pryv/logs/mongodb.log & npm run mail >> ./var-pryv/logs/mail.log & npm run api",
     "setup-dev-env": "scripts/setup-dev-env",
     "test": "echo 'This project doesn’t use npm scripts – enter `just` for the available development commands\n' && exit 1"
diff --git a/service-mail/templates/reset-password/en/html.pug b/service-mail/templates/reset-password/en/html.pug
index 83384b5..b170590 100644
--- a/service-mail/templates/reset-password/en/html.pug
+++ b/service-mail/templates/reset-password/en/html.pug
@@ -1,4 +1,4 @@
 p Hi,
 p We have received word that you have lost your password. If you have asked for a password request please click on the link below. If you did not please delete this email.
-p <a href="#{RESET_URL}?resetToken=#{RESET_TOKEN}" target="_blank">Click here</a> to reset your Pryv password.
-p Pryv team
\ No newline at end of file
+p <a href="#{RESET_URL}?resetToken=#{RESET_TOKEN}" target="_blank">Click here</a> to reset your HDS password.
+p HDS team
\ No newline at end of file
diff --git a/service-mail/templates/reset-password/fr/html.pug b/service-mail/templates/reset-password/fr/html.pug
index 06137c9..a3d28b2 100644
--- a/service-mail/templates/reset-password/fr/html.pug
+++ b/service-mail/templates/reset-password/fr/html.pug
@@ -1,4 +1,4 @@
 p Bonjour,
-p Il paraît que vous avez oublié votre mot de passe Pryv. Si vous avez bien demandé la réinitialisation de votre mot de passe, merci de cliquer sur le lien ci-dessous. Si ce n'était pas vous, merci de supprimer cet email.
+p Il paraît que vous avez oublié votre mot de passe HDS. Si vous avez bien demandé la réinitialisation de votre mot de passe, merci de cliquer sur le lien ci-dessous. Si ce n'était pas vous, merci de supprimer cet email.
 p <a href="#{RESET_URL}?resetToken=#{RESET_TOKEN}" target="_blank">Cliquez içi</a> pour réinitialiser votre mot de passe.
-p L'équipe Pryv
+p L'équipe HDS
diff --git a/service-mail/templates/reset-password/fr/subject.pug b/service-mail/templates/reset-password/fr/subject.pug
index 0b6160b..3f58fb2 100644
--- a/service-mail/templates/reset-password/fr/subject.pug
+++ b/service-mail/templates/reset-password/fr/subject.pug
@@ -1 +1 @@
-= `Bienvenue sur Pryv`
+= `Bienvenue sur Health Data Safe`
diff --git a/service-mail/templates/welcome-email/en/html.pug b/service-mail/templates/welcome-email/en/html.pug
index 46e8fd4..abbdfb5 100644
--- a/service-mail/templates/welcome-email/en/html.pug
+++ b/service-mail/templates/welcome-email/en/html.pug
@@ -1,8 +1,8 @@
 <h1><span style="color:#bd1026">Hey</span> #{USERNAME},</h1>
 
-<h2><span style="color:#bd1026">Thanks for creating your Open Pryv.io account</span></h2>
+<h2><span style="color:#bd1026">Thanks for creating your Health Data Safe account</span></h2>
 
-<p style="text-align: justify;">We have built Pryv.io so you could have a private and secure place to collect and unite your personal digital life. Connect apps and devices, get insight and share selectively.<br/></p>
+<p style="text-align: justify;">We have built HDS so you could have a private and secure place to collect and unite your personal digital life. Connect apps and devices, get insight and share selectively.<br/></p>
 
 <p style="text-align: center;">Information you entrusted us with:<br/>
 <strong>Email</strong>: #{EMAIL}<br/>
diff --git a/service-mail/templates/welcome-email/en/subject.pug b/service-mail/templates/welcome-email/en/subject.pug
index 1db63ea..06aaaa1 100644
--- a/service-mail/templates/welcome-email/en/subject.pug
+++ b/service-mail/templates/welcome-email/en/subject.pug
@@ -1 +1 @@
-= `Welcome to Open Pryv`
+= `Welcome to Health Data Safe`
diff --git a/service-mail/templates/welcome-email/fr/html.pug b/service-mail/templates/welcome-email/fr/html.pug
index 8d9429e..aa5424b 100644
--- a/service-mail/templates/welcome-email/fr/html.pug
+++ b/service-mail/templates/welcome-email/fr/html.pug
@@ -1,8 +1,8 @@
 <h1><span style="color:#bd1026">Bonjour</span> #{USERNAME},</h1>
 
-<h2><span style="color:#bd1026">Merci pour la création de votre compte Open Pryv.io</span></h2>
+<h2><span style="color:#bd1026">Merci pour la création de votre compte Health Data Safe</span></h2>
 
-<p style="text-align: justify;">Nous avons développé Pryv.io pour vous fournir une place pour collecter et unifier vos données de vies, tout en respectant votre sécurité et votre vie privée. Connectez vos applications et appareils, gérez et partagez en toute conscience.<br/></p>
+<p style="text-align: justify;">Nous avons développé HDS pour vous fournir une place pour collecter et unifier vos données de vies, tout en respectant votre sécurité et votre vie privée. Connectez vos applications et appareils, gérez et partagez en toute conscience.<br/></p>
 
 <p style="text-align: center;">Informations que vous nous avez confiées:<br/>
 <strong>Email</strong>: #{EMAIL}<br/>
diff --git a/service-mail/templates/welcome-email/fr/subject.pug b/service-mail/templates/welcome-email/fr/subject.pug
index a07cb14..b6c6f8c 100644
--- a/service-mail/templates/welcome-email/fr/subject.pug
+++ b/service-mail/templates/welcome-email/fr/subject.pug
@@ -1 +1 @@
-= `Bienvenue sur Open Pryv`
+= `Bienvenue sur HDS`