diff --git a/bwreg-webapp/src/main/resources/msg/messages_de.properties b/bwreg-webapp/src/main/resources/msg/messages_de.properties
index d2dc7e6884d37d1e3e1d63d8bdbf02a98e28145b..40ae7a38bddcf91d728b423a568171d8e8fa8417 100644
--- a/bwreg-webapp/src/main/resources/msg/messages_de.properties
+++ b/bwreg-webapp/src/main/resources/msg/messages_de.properties
@@ -373,23 +373,27 @@ email_address = E-Mail-Adresse
email_address_more = E-Mail-Adresse (weitere)
-email_addresses.add_email_address = Neue E-Mail Adresse hinzuf\u00FCgen
-email_addresses.from_attribute_source = E-Mail Adresse von einer externen Quelle
-email_addresses.heading = Meine E-Mail Adressen
-email_addresses.no_primary_email_set = Keine gesetzt
-email_addresses.no_token_found = Dieses Token ist unbekannt
-email_addresses.not_owner = Falsches Token
-email_addresses.primary_email = Prim\u00E4re E-Mail Adresse
-email_addresses.token_expired = Das Token ist abgelaufen, bitte lassen Sie sich ein neues zusenden.
-email_addresses.token_sent = \u00DCberpr\u00FCfungstoken gesendet
-email_addresses.token_valid_until = Token g\u00FCltig bis
-email_addresses.unverified = Noch nicht verifiziert
-email_addresses.verification_success = Verifizierung erfolgreich
-email_addresses.verification_success_detail = Die \u00DCberpr\u00FCfung der E-Mail-Adresse war erfolgreich. Sie k\u00F6nnen sie nun verwenden.
-email_addresses.verification_token = E-Mail Adresse best\u00E4tigen
-email_addresses.verification_valid_until = G\u00FCltig bis
-email_addresses.verified = Verifiziert
-email_addresses.verified_on = Verifiziert am
+email_addresses.add_email_address = Neue E-Mail Adresse hinzuf\u00FCgen
+email_addresses.from_attribute_source = E-Mail Adresse von einer externen Quelle
+email_addresses.heading = Meine E-Mail Adressen
+email_addresses.intro = Verwalten Sie Ihre E-Mail-Adressen oder f\u00FCgen Sie weitere hinzu, falls Ihr Login-Provider keine Adresse \u00FCbermittelt. Wenn Sie mehrere E-Mail-Adressen haben, k\u00F6nnen Sie Ihre bevorzugte E-Mail-Adresse festlegen.
+email_addresses.no_primary_email_set = Keine gesetzt
+email_addresses.no_token_found = Dieses Token ist unbekannt
+email_addresses.not_owner = Falsches Token
+email_addresses.primary_email = Aktuell gesetzte prim\u00E4re E-Mail Adresse ist
+email_addresses.set = Adresse setzen
+email_addresses.set_primary_email_success = Adresse gesetzt
+email_addresses.set_primary_email_success_detail = Prim\u00E4re E-Mail-Adresse wurde gesetzt.
+email_addresses.token_expired = Das Token ist abgelaufen, bitte lassen Sie sich ein neues zusenden.
+email_addresses.token_sent = \u00DCberpr\u00FCfungstoken gesendet
+email_addresses.token_valid_until = Token g\u00FCltig bis
+email_addresses.unverified = Noch nicht verifiziert
+email_addresses.verification_success = Verifizierung erfolgreich
+email_addresses.verification_success_detail = Die \u00DCberpr\u00FCfung der E-Mail-Adresse war erfolgreich. Sie k\u00F6nnen sie nun verwenden.
+email_addresses.verification_token = E-Mail Adresse best\u00E4tigen
+email_addresses.verification_valid_until = G\u00FCltig bis
+email_addresses.verified = Verifiziert
+email_addresses.verified_on = Verifiziert am
email_signature_keys = Schl\u00FCssel zum Signieren
diff --git a/bwreg-webapp/src/main/resources/msg/messages_en.properties b/bwreg-webapp/src/main/resources/msg/messages_en.properties
index 298dc2c23671353b56f6f4ab5bed4b1e0433000d..5a89177f6787cac7d2235ed62704f4b7d06833d3 100644
--- a/bwreg-webapp/src/main/resources/msg/messages_en.properties
+++ b/bwreg-webapp/src/main/resources/msg/messages_en.properties
@@ -373,23 +373,27 @@ email_address = E-Mail address
email_address_more = E-Mail address (more)
-email_addresses.add_email_address = Add new e-mail address
-email_addresses.from_attribute_source = E-mail address from an external source
-email_addresses.heading = My E-Mail-Addresses
-email_addresses.no_primary_email_set = None set
-email_addresses.no_token_found = This token is unknown
-email_addresses.not_owner = Token wrong
-email_addresses.primary_email = Primary e-mail address
-email_addresses.token_expired = The token has expired, please have a new one sent to you.
-email_addresses.token_sent = Verification token sent
-email_addresses.token_valid_until = Token valid until
-email_addresses.unverified = Not yet verified
-email_addresses.verification_success = Verification successful
-email_addresses.verification_success_detail = The verification of the e-mail address was successful. You can now use it.
-email_addresses.verification_token = Confirm e-mail address
-email_addresses.verification_valid_until = Valid until
-email_addresses.verified = Verified
-email_addresses.verified_on = Verified on
+email_addresses.add_email_address = Add new e-mail address
+email_addresses.from_attribute_source = E-mail address from an external source
+email_addresses.heading = My E-Mail-Addresses
+email_addresses.intro = Manage your e-mail addresses or add more if your login provider does not provide an address. If you have several e-mail addresses, you can specify your preferred e-mail address.
+email_addresses.no_primary_email_set = None set
+email_addresses.no_token_found = This token is unknown
+email_addresses.not_owner = Token wrong
+email_addresses.primary_email = Primary e-mail address
+email_addresses.set = Set address
+email_addresses.set_primary_email_success = Address set
+email_addresses.set_primary_email_success_detail = Primary e-mail address has been set.
+email_addresses.token_expired = The token has expired, please have a new one sent to you.
+email_addresses.token_sent = Verification token sent
+email_addresses.token_valid_until = Token valid until
+email_addresses.unverified = Not yet verified
+email_addresses.verification_success = Verification successful
+email_addresses.verification_success_detail = The verification of the e-mail address was successful. You can now use it.
+email_addresses.verification_token = Confirm e-mail address
+email_addresses.verification_valid_until = Valid until
+email_addresses.verified = Verified
+email_addresses.verified_on = Verified on
email_signature_keys = Keys for signing emails
diff --git a/bwreg-webapp/src/main/resources/msg/messages_fr.properties b/bwreg-webapp/src/main/resources/msg/messages_fr.properties
index 2ff5a7874a6b658fed5670e877df9c0a82d8b75c..37db47dbd3451c64d730342e1b0a8474918ad1b6 100644
--- a/bwreg-webapp/src/main/resources/msg/messages_fr.properties
+++ b/bwreg-webapp/src/main/resources/msg/messages_fr.properties
@@ -373,23 +373,27 @@ email_address = Adresse \u00E9lectronique
email_address_more = Adresse \u00E9lectronique (plus)
-email_addresses.add_email_address = Ajouter une nouvelle adresse e-mail
-email_addresses.from_attribute_source = Adresse e-mail d'une source externe
-email_addresses.heading = Mes adresses e-mail
-email_addresses.no_primary_email_set = Aucune d\u00E9finie
-email_addresses.no_token_found = Ce token est inconnu
-email_addresses.not_owner = Mauvais token
-email_addresses.primary_email = Adresse e-mail primaire
-email_addresses.token_expired = Le token est expir\u00E9, veuillez vous en faire envoyer un nouveau.
-email_addresses.token_sent = Jeton de v\u00E9rification envoy\u00E9
-email_addresses.token_valid_until = Token valable jusqu'au
-email_addresses.unverified = Pas encore v\u00E9rifi\u00E9
-email_addresses.verification_success = V\u00E9rification r\u00E9ussie
-email_addresses.verification_success_detail = La v\u00E9rification de l'adresse e-mail a \u00E9t\u00E9 effectu\u00E9e avec succ\u00E8s. Vous pouvez maintenant l'utiliser.
-email_addresses.verification_token = Confirmer l'adresse e-mail
-email_addresses.verification_valid_until = Valable jusqu'au
-email_addresses.verified = V\u00E9rifi\u00E9
-email_addresses.verified_on = V\u00E9rifi\u00E9 le
+email_addresses.add_email_address = Ajouter une nouvelle adresse e-mail
+email_addresses.from_attribute_source = Adresse e-mail d'une source externe
+email_addresses.heading = Mes adresses e-mail
+email_addresses.intro = G\u00E9rez vos adresses e-mail ou ajoutez-en d'autres si votre fournisseur de connexion ne transmet pas d'adresse. Si vous avez plusieurs adresses e-mail, vous pouvez d\u00E9finir votre adresse e-mail pr\u00E9f\u00E9r\u00E9e.
+email_addresses.no_primary_email_set = Aucune d\u00E9finie
+email_addresses.no_token_found = Ce token est inconnu
+email_addresses.not_owner = Mauvais token
+email_addresses.primary_email = The currently set primary e-mail address is
+email_addresses.set = D\u00E9finir l'adresse
+email_addresses.set_primary_email_success = Adresse d\u00E9finie
+email_addresses.set_primary_email_success_detail = L'adresse e-mail primaire a \u00E9t\u00E9 d\u00E9finie.
+email_addresses.token_expired = Le token est expir\u00E9, veuillez vous en faire envoyer un nouveau.
+email_addresses.token_sent = Jeton de v\u00E9rification envoy\u00E9
+email_addresses.token_valid_until = Token valable jusqu'au
+email_addresses.unverified = Pas encore v\u00E9rifi\u00E9
+email_addresses.verification_success = V\u00E9rification r\u00E9ussie
+email_addresses.verification_success_detail = La v\u00E9rification de l'adresse e-mail a \u00E9t\u00E9 effectu\u00E9e avec succ\u00E8s. Vous pouvez maintenant l'utiliser.
+email_addresses.verification_token = Confirmer l'adresse e-mail
+email_addresses.verification_valid_until = Valable jusqu'au
+email_addresses.verified = V\u00E9rifi\u00E9
+email_addresses.verified_on = V\u00E9rifi\u00E9 le
email_signature_keys = Cl\u00E9s pour signer des e-mails
diff --git a/bwreg-webapp/src/main/webapp/user/email-addresses.xhtml b/bwreg-webapp/src/main/webapp/user/email-addresses.xhtml
index 463f4cc3f93af8d5eb5b66c17b74f211ada40e55..3a31c9b79adfd4fe464f5e359a43f8000b856e03 100644
--- a/bwreg-webapp/src/main/webapp/user/email-addresses.xhtml
+++ b/bwreg-webapp/src/main/webapp/user/email-addresses.xhtml
@@ -27,9 +27,17 @@
<h:form id="form" prependId="false" class="full">
<h3><h:outputText value="#{messages['email_addresses.heading']}"/></h3>
-
+ <div><h:outputText value="#{messages['email_addresses.intro']}"/></div>
<div><p:messages showDetail="true" /></div>
+ <div>
+ <h:outputText value="#{messages['email_addresses.primary_email']}"/>
+ <b>
+ <h:outputText value="#{emailAddressesBean.identity.primaryEmail.emailAddress}" rendered="#{emailAddressesBean.identity.primaryEmail != null}"/>
+ <h:outputText value="#{messages['email_addresses.no_primary_email_set']}" rendered="#{emailAddressesBean.identity.primaryEmail == null}"/>
+ </b>
+ </div>
+
<div class="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9">
<p:selectOneListbox id="userSelect" var="e" value="#{emailAddressesBean.chosenPrimary}" converter="#{identityEmailAddressConverter}"
style="font-size: 1em;">
@@ -39,14 +47,9 @@
</p:column>
</p:selectOneListbox>
<div class="form">
- <p:commandButton action="#{emailAddressesBean.setPrimaryEmailAddress()}" value="#{messages['set']}" validateClient="true" ajax="true" update="@all" />
+ <p:commandButton action="#{emailAddressesBean.setPrimaryEmailAddress()}" value="#{messages['email_addresses.set']}" validateClient="true" ajax="true" update="@all" />
</div>
</div>
- <div>
- <h:outputText value="#{messages['email_addresses.primary_email']}: "/>
- <h:outputText value="#{emailAddressesBean.identity.primaryEmail.emailAddress}" rendered="#{emailAddressesBean.identity.primaryEmail != null}"/>
- <h:outputText value="#{messages['email_addresses.no_primary_email_set']}" rendered="#{emailAddressesBean.identity.primaryEmail == null}"/>
- </div>
<ui:repeat var="email" value="#{emailAddressesBean.identity.emailAddresses}">
<h:panelGroup layout="block" styleClass="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9"