From 9d26599f785140787c4e183a742582c481d2860e Mon Sep 17 00:00:00 2001
From: Sabrina Arnold <sarnold@codematix.de>
Date: Mon, 6 Nov 2023 14:22:49 +0100
Subject: [PATCH] Add first name and last name with login as fallback to
 cockpit, email notifications, and registration form

---
 .../i18n/configuration/translations-de.js     | 18 ++++++-----
 .../i18n/configuration/translations-en.js     |  4 +++
 .../directives/user-list.html.tmpl            | 15 ++++++++--
 .../account/register/register.html.tmpl       | 30 +++++++++++++++++++
 .../configuration/translations-de.js          | 24 ++++++++++-----
 .../configuration/translations-en.js          | 10 +++++++
 .../resources/i18n/messages_de.properties     | 30 ++++++++++++-------
 .../resources/i18n/messages_en.properties     | 30 ++++++++++++-------
 src/main/resources/mails/activationEmail.html |  7 +++--
 .../mails/addedToProjectConfiguration.html    |  5 +++-
 .../resources/mails/assigneeGroupChanged.html |  5 +++-
 .../dataPackageOverviewGeneratedEmail.html    |  7 +++--
 .../mails/dataProviderAccessRevoked.html      |  5 +++-
 .../mails/datasetReportGeneratedEmail.html    |  7 +++--
 .../resources/mails/passwordResetEmail.html   |  5 +++-
 .../removedFromProjectConfiguration.html      |  5 +++-
 16 files changed, 158 insertions(+), 49 deletions(-)

diff --git a/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-de.js b/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-de.js
index 18e4371f79c..aeed413f087 100644
--- a/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-de.js
+++ b/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-de.js
@@ -196,10 +196,14 @@ angular.module('metadatamanagementApp').config([
         'form': {
           'username': 'Benutzer:innenname',
           'username-placeholder': 'Ihr Benutzer:innenname',
+          'firstname': 'Vorname',
+          'firstname-placeholder': 'Ihr Vorname',
+          'lastname': 'Nachname',
+          'lastname-placeholder': 'Ihr Nachname',
           'newpassword': 'Neues Passwort',
           'newpassword-placeholder': 'Neues Passwort',
           'confirmpassword': 'Neues Passwort bestätigen',
-          'confirmpassword-placeholder': 'Bestätigen Sie ihr neues Passwort',
+          'confirmpassword-placeholder': 'Bestätigen Sie Ihr neues Passwort',
           'email': 'E-Mail Adresse',
           'email-placeholder': 'Ihre E-Mail Adresse'
         },
@@ -216,20 +220,20 @@ angular.module('metadatamanagementApp').config([
           'validate': {
             'newpassword': {
               'required': 'Ein neues Passwort wird benötigt.',
-              'minlength': 'Das neue Passwort muss mindestens 5 Zeichen lang sein',
-              'maxlength': 'Das neue Passwort darf nicht länger als 50 Zeichen sein',
+              'minlength': 'Das neue Passwort muss mindestens 5 Zeichen lang sein.',
+              'maxlength': 'Das neue Passwort darf nicht länger als 50 Zeichen sein.',
               'strength': 'Passwortstärke:'
             },
             'confirmpassword': {
               'required': 'Sie müssen das Passwort bestätigen.',
-              'minlength': 'Das bestätigte Passwort muss mindestens 5 Zeichen lang sein',
-              'maxlength': 'Das bestätigte Passwort darf nicht länger als 50 Zeichen sein'
+              'minlength': 'Das bestätigte Passwort muss mindestens 5 Zeichen lang sein.',
+              'maxlength': 'Das bestätigte Passwort darf nicht länger als 50 Zeichen sein.'
             },
             'email': {
               'required': 'Ihre E-Mail Adresse wird benötigt.',
               'invalid': 'Ihre E-Mail Adresse ist ungültig.',
-              'minlength': 'Ihre E-Mail Adresse muss mindestens 5 Zeichen lang sein',
-              'maxlength': 'Ihre E-Mail Adresse darf nicht länger als 50 Zeichen sein'
+              'minlength': 'Ihre E-Mail Adresse muss mindestens 5 Zeichen lang sein.',
+              'maxlength': 'Ihre E-Mail Adresse darf nicht länger als 50 Zeichen sein.'
             }
           }
         },
diff --git a/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-en.js b/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-en.js
index d8b45107c1a..7fe98b03ebf 100644
--- a/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-en.js
+++ b/mdm-frontend/src/app/legacy/common/i18n/configuration/translations-en.js
@@ -196,6 +196,10 @@ angular.module('metadatamanagementApp').config([
         'form': {
           'username': 'Username',
           'username-placeholder': 'Your username',
+          'firstname': 'First name',
+          'firstname-placeholder': 'Your first name',
+          'lastname': 'Last name',
+          'lastname-placeholder': 'Your last name',
           'newpassword': 'New password',
           'newpassword-placeholder': 'New password',
           'confirmpassword': 'New password confirmation',
diff --git a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/user-list.html.tmpl b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/user-list.html.tmpl
index 204d2d0d505..148a47289db 100644
--- a/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/user-list.html.tmpl
+++ b/mdm-frontend/src/app/legacy/dataacquisitionprojectmanagement/directives/user-list.html.tmpl
@@ -18,7 +18,12 @@
 	>
 		<md-item-template>
 			<div layout="row">
-				<strong><span md-highlight-text="ctrl.searchText">{{user.login}}</span></strong>
+				<strong ng-if="!(!!user.firstName && !!user.lastName)">
+                    <span md-highlight-text="ctrl.searchText">{{user.login}}</span>
+                </strong>
+				<strong ng-if="!!user.firstName && !!user.lastName">
+                    <span md-highlight-text="ctrl.searchText">{{user.firstName}}</span>&nbsp;<span md-highlight-text="ctrl.searchText">{{user.lastName}}</span>
+                </strong>
 				&nbsp;
 				<span md-highlight-text="ctrl.searchText">({{user.email}})</span>
 			</div>
@@ -32,7 +37,13 @@
 		<div ng-repeat="user in ctrl.activeUsers">
 			<md-list-item layout="row" class="pr0">
 				<div class="md-list-item-text">
-					<strong>{{user.login}}</strong> (<a href="mailto:{{user.email}}">{{user.email}}</a>)
+                    <strong ng-if="!(!!user.firstName && !!user.lastName)">
+                        <strong>{{user.login}}</strong> 
+                    </strong>
+                    <strong ng-if="!!user.firstName && !!user.lastName">
+                        <strong>{{user.firstName}} {{user.lastName}}</strong>
+                    </strong>
+                    &nbsp;(<a href="mailto:{{user.email}}">{{user.email}}</a>)
 				</div>
 				<span flex></span>
 				<md-button ng-disabled="ctrl.disabled || !ctrl.canDeleteUser(user)" class="md-icon-button md-primary" ng-click="ctrl.removeUser(user, ctrl.group)">
diff --git a/mdm-frontend/src/app/legacy/usermanagement/account/register/register.html.tmpl b/mdm-frontend/src/app/legacy/usermanagement/account/register/register.html.tmpl
index aaca975395a..b7937720446 100644
--- a/mdm-frontend/src/app/legacy/usermanagement/account/register/register.html.tmpl
+++ b/mdm-frontend/src/app/legacy/usermanagement/account/register/register.html.tmpl
@@ -47,6 +47,36 @@
                         </p>
                     </div>
                 </div>
+                <div class="form-group" ng-class="{'has-error': form.firstname.$dirty && form.firstname.$invalid}">
+                    <label class="control-label" for="firstname" data-translate="global.form.firstname">First name</label>
+                    <input type="text" class="form-control" id="firstname" name="firstname" placeholder="{{'global.form.firstname-placeholder' | translate}}" ng-model="registerAccount.firstName" ng-minlength=1 ng-maxlength=50 required>
+                    <div ng-show="form.firstname.$dirty && form.firstname.$invalid">
+                        <p class="help-block" ng-show="form.firstname.$error.required" data-translate="user-management.register.messages.validate.firstname.required">
+                            Your first name is required.
+                        </p>
+                        <p class="help-block" ng-show="form.firstname.$error.minlength" data-translate="user-management.register.messages.validate.firstname.minlength">
+                            Your first name is required to be at least 1 character.
+                        </p>
+                        <p class="help-block" ng-show="form.firstname.$error.maxlength" data-translate="user-management.register.messages.validate.firstname.maxlength">
+                            Your first name cannot be longer than 50 characters.
+                        </p>
+                    </div>
+                </div>
+                <div class="form-group" ng-class="{'has-error': form.lastname.$dirty && form.lastname.$invalid}">
+                    <label class="control-label" for="lastname" data-translate="global.form.lastname">Last name</label>
+                    <input type="text" class="form-control" id="lastname" name="lastname" placeholder="{{'global.form.lastname-placeholder' | translate}}" ng-model="registerAccount.lastName" ng-minlength=1 ng-maxlength=50 required>
+                    <div ng-show="form.lastname.$dirty && form.lastname.$invalid">
+                        <p class="help-block" ng-show="form.lastname.$error.required" data-translate="user-management.register.messages.validate.lastname.required">
+                            Your last name is required.
+                        </p>
+                        <p class="help-block" ng-show="form.lastname.$error.minlength" data-translate="user-management.register.messages.validate.lastname.minlength">
+                            Your last name is required to be at least 1 character.
+                        </p>
+                        <p class="help-block" ng-show="form.lastname.$error.maxlength" data-translate="user-management.register.messages.validate.lastname.maxlength">
+                            Your last name cannot be longer than 50 characters.
+                        </p>
+                    </div>
+                </div>
                 <div class="form-group" ng-class="{'has-error': form.email.$dirty && form.email.$invalid}">
                     <label class="control-label" for="email" data-translate="global.form.email">E-mail</label>
                     <input type="email" class="form-control" id="email" name="email" placeholder="{{'global.form.email-placeholder' | translate}}" ng-model="registerAccount.email" ng-minlength=5 ng-maxlength=100 required>
diff --git a/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-de.js b/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-de.js
index a78be3af48d..8d9a4deac85 100644
--- a/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-de.js
+++ b/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-de.js
@@ -95,16 +95,26 @@ angular.module('metadatamanagementApp').config([
             'validate': {
               'login': {
                 'required': 'Ihr Benutzer:innenname wird benötigt.',
-                'minlength': 'Ihr Benutzer:innenname muss mindestens 1 Zeichen lang sein',
-                'maxlength': 'Ihr Benutzer:innenname darf nicht länger als 50 Zeichen sein',
-                'pattern': 'Ihr Benutzer:innenname darf nur Kleinbuchstaben und Ziffern enthalten'
+                'minlength': 'Ihr Benutzer:innenname muss mindestens 1 Zeichen lang sein.',
+                'maxlength': 'Ihr Benutzer:innenname darf nicht länger als 50 Zeichen sein.',
+                'pattern': 'Ihr Benutzer:innenname darf nur Kleinbuchstaben und Ziffern enthalten.'
+              },
+              'firstname': {
+                'required': 'Ihr Vorname wird benötigt.',
+                'minlength': 'Ihr Vorname muss mindestens 1 Zeichen lang sein.',
+                'maxlength': 'Ihr Vorname darf nicht länger als 50 Zeichen sein.'
+              },
+              'lastname': {
+                'required': 'Ihr Nachname wird benötigt.',
+                'minlength': 'Ihr Nachname muss mindestens 1 Zeichen lang sein.',
+                'maxlength': 'Ihr Nachname darf nicht länger als 50 Zeichen sein.'
               }
             },
-            'success': '<strong>Registrierung gespeichert!</strong> Bitte überprüfen Sie ihre E-Mails für die Bestätigung.',
+            'success': '<strong>Registrierung gespeichert!</strong> Bitte überprüfen Sie Ihre E-Mails für die Bestätigung.',
             'error': {
               'fail': '<strong>Registrierung fehlgeschlagen!</strong> Bitte versuchen Sie es später nochmal.',
               'userexists': '<strong>Benutzer:innenname bereits vergeben!</strong> Bitte wählen Sie einen anderen aus.',
-              'emailexists': '<strong>E-mail wird bereits verwendet!</strong> Bitte wählen Sie eine andere aus.'
+              'emailexists': '<strong>E-Mail wird bereits verwendet!</strong> Bitte wählen Sie eine andere aus.'
             }
           }
         },
@@ -117,7 +127,7 @@ angular.module('metadatamanagementApp').config([
             'messages': {
               'info': 'Geben Sie die E-Mail Adresse ein, welche Sie bei der Registrierung verwendet haben.',
               'success': 'Eine E-Mail mit weiteren Instruktionen für das Zurücksetzen des Passworts wurde gesendet.',
-              'notfound': '<strong>Diese E-Mail Adresse existiert nicht!</strong> Überprüfen Sie ihre E-Mail Adresse und versuchen Sie es nochmal.'
+              'notfound': '<strong>Diese E-Mail Adresse existiert nicht!</strong> Überprüfen Sie Ihre E-Mail Adresse und versuchen Sie es nochmal.'
             }
           },
           'finish': {
@@ -146,7 +156,7 @@ angular.module('metadatamanagementApp').config([
           'messages': {
             'error': {
               'fail': '<strong>Es ist ein Fehler aufgetreten!</strong> Die Kontoänderungen konnten nicht gespeichert werden.',
-              'emailexists': '<strong>E-mail wird bereits verwendet!</strong> Bitte wählen Sie eine andere aus.'
+              'emailexists': '<strong>E-Mail wird bereits verwendet!</strong> Bitte wählen Sie eine andere aus.'
             },
             'success': '<strong>Kontoänderungen wurden gespeichert!</strong>',
             'validate': {
diff --git a/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-en.js b/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-en.js
index 69c225cb803..d58349f4bcd 100644
--- a/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-en.js
+++ b/mdm-frontend/src/app/legacy/usermanagement/configuration/translations-en.js
@@ -98,6 +98,16 @@ angular.module('metadatamanagementApp').config([
                 'minlength': 'Your username is required to be at least 1 character.',
                 'maxlength': 'Your username cannot be longer than 50 characters.',
                 'pattern': 'Your username can only contain lower-case letters and digits.'
+              },
+              'firstname': {
+                'required': 'Your first name is required.',
+                'minlength': 'Your first name is required to be at least 1 character.',
+                'maxlength': 'Your first name cannot be longer than 50 characters.',
+              },
+              'lastname': {
+                'required': 'Your last name is required.',
+                'minlength': 'Your last name is required to be at least 1 character.',
+                'maxlength': 'Your last name cannot be longer than 50 characters.',
               }
             },
             'success': '<strong>Registration saved!</strong> Please check your email for confirmation.',
diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties
index 2ce62dfad9d..ad2640346ba 100644
--- a/src/main/resources/i18n/messages_de.properties
+++ b/src/main/resources/i18n/messages_de.properties
@@ -6,14 +6,16 @@ error.message=Meldung:
 
 # Activation e-mail
 email.activation.title=Aktivierung Ihres Kontos
-email.activation.greeting=Liebe(r) {0},
+email.activation.greetingLogin=Liebe(r) {0},
+email.activation.greeting=Liebe(r) {0} {1},
 email.activation.text1=Ihr Konto in unserem Metadatensystem wurde angelegt, bitte klicken Sie auf den folgenden Link, um das Konto zu aktivieren:
 email.activation.text2=Grüße,
 email.signature=Ihr FDZ-Team.
 
 # Reset e-mail
 email.reset.title=Passwort zurücksetzen
-email.reset.greeting=Liebe(r) {0},
+email.reset.greetingLogin=Liebe(r) {0},
+email.reset.greeting=Liebe(r) {0} {1},
 email.reset.text1=Für Ihr Konto in unserem Metadatensystem wurde die Zurücksetzung des Passwords angefordert, bitte klicken Sie auf den folgenden Link, um Ihr Passwort zurückzusetzen:
 email.reset.text2=Grüße,
 
@@ -27,14 +29,16 @@ email.order.created.regards=Grüße,
 
 # Project configuration added added
 email.project-configuration-added.title=Sie wurden dem Projekt {0} hinzugefügt
-email.project-configuration-added.greeting=Liebe(r) {0},
+email.project-configuration-added.greetingLogin=Liebe(r) {0},
+email.project-configuration-added.greeting=Liebe(r) {0} {1},
 email.project-configuration-added.text1=Sie wurden dem Projekt
 email.project-configuration-added.text2=als {0} hinzugefügt.
 email.project-configuration-added.text3=Grüße,
 
 # Project configuration removed
 email.project-configuration-removed.title=Sie wurden aus dem Projekt {0} entfernt
-email.project-configuration-removed.greeting=Liebe(r) {0},
+email.project-configuration-removed.greetingLogin=Liebe(r) {0},
+email.project-configuration-removed.greeting=Liebe(r) {0} {1},
 email.project-configuration-removed.text1=Sie wurden aus dem Projekt
 email.project-configuration-removed.text2=als {0} entfernt.
 email.project-configuration-removed.text3=Grüße,
@@ -45,7 +49,8 @@ email.project-configuration.data-provider-role=Datengeber:in
 
 #Assignee Group Changed
 email.assignee-group-changed.title=Projekt {0} wurde Ihnen zur Bearbeitung zugewiesen
-email.assignee-group-changed.greeting=Liebe(r) {0},
+email.assignee-group-changed.greetingLogin=Liebe(r) {0},
+email.assignee-group-changed.greeting=Liebe(r) {0} {1},
 email-assignee-group-changed.text1=das Projekt
 email-assignee-group-changed.text2=wurde Ihnen zur Bearbeitung zugewiesen.
 email-assignee-group-changed.text3=Es wurde folgende Nachricht hinterlassen:
@@ -53,30 +58,35 @@ email-assignee-group-changed.text4=Grüße,
 
 #Data Provider Access Revoked
 email.data-provider-access-revoked.title=Projekt {0} wurde Publishern zugewiesen
-email.data-provider-access-revoked.greeting=Liebe(r) {0},
+email.data-provider-access-revoked.greetingLogin=Liebe(r) {0},
+email.data-provider-access-revoked.greeting=Liebe(r) {0} {1},
 email.data-provider-access-revoked.text1=Das Projekt
 email.data-provider-access-revoked.text2=wurde wieder der Gruppe der Publisher zugewiesen.
 email.data-provider-access-revoked.text3=Grüße,
 
 email.dataset-report-generated.title=Datensatzreport zu Datensatz "{0}" in Sprache "{1}" erfolgreich erzeugt
-email.dataset-report-generated.greeting=Liebe(r) {0},
+email.dataset-report-generated.greetingLogin=Liebe(r) {0},
+email.dataset-report-generated.greeting=Liebe(r) {0} {1},
 email.dataset-report-generated.text=Ihr Datensatzreport in Sprache "{0}" wurde erfolgreich erzeugt und kann, wenn Sie angemeldet sind, hier betrachtet werden:
 email.dataset-report-generated.link=Datensatzdetails zu "{0}" im MDM
 
 email.datapackage-overview-generated.title=Übersicht zu Datenpaket "{0}" in Sprache "{1}" erfolgreich erzeugt
-email.datapackage-overview-generated.greeting=Liebe(r) {0},
+email.datapackage-overview-generated.greetingLogin=Liebe(r) {0},
+email.datapackage-overview-generated.greeting=Liebe(r) {0} {1},
 email.datapackage-overview-generated.text=Ihre Datenpaketübersicht in Sprache "{0}" wurde erfolgreich erzeugt und kann, wenn Sie angemeldet sind, hier betrachtet werden:
 email.datapackage-overview-generated.link=Datenpaketdetails zu "{0}" im MDM
 
 email.dataset-report-error.title=Fehler beim Erzeugen des Datensatzreports zu Datensatz "{0}"
-email.dataset-report-error.greeting=Liebe(r) {0},
+email.dataset-report-error.greetingLogin=Liebe(r) {0},
+email.dataset-report-error.greeting=Liebe(r) {0} {1},
 email.dataset-report-error.starttext=beim Erzeugen Ihres Datensatzreports zu
 email.dataset-report-error.link=Datensatz "{0}"
 email.dataset-report-error.endtext=ist folgender Fehler aufgetreten:
 email.dataset-report-error.admintext=Die Administrator:innen des MDM wurden ebenfalls benachrichtigt und werden Sie ggf. kontaktieren.
 
 email.datapackage-overview-error.title=Fehler beim Erzeugen der Übersicht zu Datensatz "{0}"
-email.datapackage-overview-error.greeting=Liebe(r) {0},
+email.datapackage-overview-error.greetingLogin=Liebe(r) {0},
+email.datapackage-overview-error.greeting=Liebe(r) {0} {1},
 email.datapackage-overview-error.starttext=beim Erzeugen Ihrer Übersicht zu
 email.datapackage-overview-error.link=Datenpaket "{0}"
 email.datapackage-overview-error.endtext=ist folgender Fehler aufgetreten:
diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties
index ba64776b3f6..2d1627d82b4 100644
--- a/src/main/resources/i18n/messages_en.properties
+++ b/src/main/resources/i18n/messages_en.properties
@@ -6,14 +6,16 @@ error.message=Message:
 
 # Activation e-mail
 email.activation.title=Activation of your account
-email.activation.greeting=Dear {0},
+email.activation.greetingLogin=Dear {0},
+email.activation.greeting=Dear {0} {1},
 email.activation.text1=Your account of our Metadatasystem has been created. Please click on the link below to activate it:
 email.activation.text2=Regards,
 email.signature=Your FDZ-Team.
 
 # Reset e-mail
 email.reset.title=Reset your password
-email.reset.greeting=Dear {0},
+email.reset.greetingLogin=Dear {0},
+email.reset.greeting=Dear {0} {1},
 email.reset.text1=You have requested resetting your password for our Metadatasystem. Please click on the link below to reset it:
 email.reset.text2=Regards,
 
@@ -27,14 +29,16 @@ email.order.created.regards=Regards,
 
 # Publishers added
 email.project-configuration-added.title=You have been added to project {0}
-email.project-configuration-added.greeting=Dear {0},
+email.project-configuration-added.greetingLogin=Dear {0},
+email.project-configuration-added.greeting=Dear {0} {1},
 email.project-configuration-added.text1=You have been added to
 email.project-configuration-added.text2=as a {0}.
 email.project-configuration-added.text3=Regards,
 
 # Publishers removed
 email.project-configuration-removed.title=You have been removed from project {0}
-email.project-configuration-removed.greeting=Dear {0},
+email.project-configuration-removed.greetingLogin=Dear {0},
+email.project-configuration-removed.greeting=Dear {0} {1},
 email.project-configuration-removed.text1=You have been removed from project
 email.project-configuration-removed.text2=as a {0}.
 email.project-configuration-removed.text3=Regards,
@@ -45,7 +49,8 @@ email.project-configuration.data-provider-role=Data Provider
 
 #Assignee Group Changed
 email.assignee-group-changed.title=You have been assigned to edit project {0}
-email.assignee-group-changed.greeting=Dear {0},
+email.assignee-group-changed.greetingLogin=Dear {0},
+email.assignee-group-changed.greeting=Dear {0} {1},
 email-assignee-group-changed.text1=You have been assigned to edit project
 email-assignee-group-changed.text2=.
 email-assignee-group-changed.text3=The following message was provided:
@@ -53,30 +58,35 @@ email-assignee-group-changed.text4=Regards,
 
 #Data Provider Access Revoked
 email.data-provider-access-revoked.title=Project {0} has been assigned to publishers
-email.data-provider-access-revoked.greeting=Dear {0},
+email.data-provider-access-revoked.greetingLogin=Dear {0},
+email.data-provider-access-revoked.greeting=Dear {0} {1},
 email.data-provider-access-revoked.text1=Project
 email.data-provider-access-revoked.text2=has been reassigned back to the publisher group.
 email.data-provider-access-revoked.text3=Regards,
 
 email.dataset-report-generated.title=Dataset Report for Dataset "{0}" in language "{1}" generated successfully
-email.dataset-report-generated.greeting=Dear {0},
+email.dataset-report-generated.greetingLogin=Dear {0},
+email.dataset-report-generated.greeting=Dear {0} {1},
 email.dataset-report-generated.text=Your dataset report was successfully generated in language "{0}" and can be viewed here if you are logged in:
 email.dataset-report-generated.link=Dataset "{0}" in the MDM
 
 email.datapackage-overview-generated.title=Overview for Data Package "{0}" in language "{1}" generated successfully
-email.datapackage-overview-generated.greeting=Dear {0},
+email.datapackage-overview-generated.greetingLogin=Dear {0},
+email.datapackage-overview-generated.greeting=Dear {0} {1},
 email.datapackage-overview-generated.text=Your data package overview was successfully generated in language "{0}" and can be viewed here if you are logged in:
 email.datapackage-overview-generated.link=Data Package "{0}" in the MDM
 
 email.dataset-report-error.title=Error when generating report for Dataset "{0}"
-email.dataset-report-error.greeting=Dear {0},
+email.dataset-report-error.greetingLogin=Dear {0},
+email.dataset-report-error.greeting=Dear {0} {1},
 email.dataset-report-error.starttext=the following error occurred when creating your report for
 email.dataset-report-error.link=Dataset "{0}"
 email.dataset-report-error.endtext=:
 email.dataset-report-error.admintext=The administrators of the MDM have also been notified and will contact you if necessary.
 
 email.datapackage-overview-error.title=Error when generating overview for Data Package "{0}"
-email.datapackage-overview-error.greeting=Dear {0},
+email.datapackage-overview-error.greetingLogin=Dear {0},
+email.datapackage-overview-error.greeting=Dear {0} {1},
 email.datapackage-overview-error.starttext=the following error occurred when creating your overview for
 email.datapackage-overview-error.link=Data Package "{0}"
 email.datapackage-overview-error.endtext=:
diff --git a/src/main/resources/mails/activationEmail.html b/src/main/resources/mails/activationEmail.html
index 45975a65eb6..1add49a4e9b 100644
--- a/src/main/resources/mails/activationEmail.html
+++ b/src/main/resources/mails/activationEmail.html
@@ -17,8 +17,11 @@
 </style>
 </head>
 <body>
-	<p th:text="#{email.activation.greeting(${user.login})}">Dear</p>
-	<p>
+	<p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+     th:text="#{email.activation.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+  <p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+     th:text="#{email.activation.greetingLogin(${user.login})}">Dear</p>
+  <p>
 		<span th:text="#{email.activation.text1}">Your Account of our
 			Metadatasystem has been created. Please click on the link below to
 			activate it:</span> <br /> <a
diff --git a/src/main/resources/mails/addedToProjectConfiguration.html b/src/main/resources/mails/addedToProjectConfiguration.html
index 14971950711..0d7ab3a0ea3 100644
--- a/src/main/resources/mails/addedToProjectConfiguration.html
+++ b/src/main/resources/mails/addedToProjectConfiguration.html
@@ -16,7 +16,10 @@
     </style>
 </head>
 <body>
-<p th:text="#{email.project-configuration-added.greeting(${user.login})}">Dear</p>
+<p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+   th:text="#{email.project-configuration-added.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+<p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+   th:text="#{email.project-configuration-added.greetingLogin(${user.login})}">Dear</p>
 <p>
     <span th:text="#{email.project-configuration-added.text1}">You have been added to</span>
     <a th:href="@{|${baseUrl}/${#locale.language}/projects/${projectId}|}" th:text="|${projectId}|">project</a>
diff --git a/src/main/resources/mails/assigneeGroupChanged.html b/src/main/resources/mails/assigneeGroupChanged.html
index 3430f8c237a..0eba4449bbc 100644
--- a/src/main/resources/mails/assigneeGroupChanged.html
+++ b/src/main/resources/mails/assigneeGroupChanged.html
@@ -16,7 +16,10 @@
     </style>
 </head>
 <body>
-<p th:text="#{email.assignee-group-changed.greeting(${user.login})}">Dear</p>
+<p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+   th:text="#{email.assignee-group-changed.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+<p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+   th:text="#{email.assignee-group-changed.greetingLogin(${user.login})}">Dear</p>
 <p>
     <span th:text="#{email-assignee-group-changed.text1}">You have been assigned to update project</span>
     <a th:href="@{|${baseUrl}/${#locale.language}/projects/${projectId}|}" th:text="|${projectId}|">project</a>
diff --git a/src/main/resources/mails/dataPackageOverviewGeneratedEmail.html b/src/main/resources/mails/dataPackageOverviewGeneratedEmail.html
index c8679b83ff1..77a29ae5f41 100644
--- a/src/main/resources/mails/dataPackageOverviewGeneratedEmail.html
+++ b/src/main/resources/mails/dataPackageOverviewGeneratedEmail.html
@@ -18,9 +18,10 @@
 </head>
 <body
 	style="font-family: Roboto, 'Helvetica Neue', sans-serif; color: black;">
-	<p th:text="#{email.datapackage-overview-generated.greeting(${user.login})}">
-		Liebe(r) rreitmann,</p>
-	<p>
+  <p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+     th:text="#{email.datapackage-overview-generated.greeting(${user.firstName}, ${user.lastName})}">Liebe(r) rreitmann,</p>
+  <p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+     th:text="#{email.datapackage-overview-generated.greetingLogin(${user.login})}">Liebe(r) rreitmann,</p>
 	<span th:text="#{email.datapackage-overview-generated.text(${language})}">Ihr
 		Datensatzreport wurde erfolgreich erzeugt und kann, wenn Sie
 		angemeldet sind, hier betrachted werden:</span>
diff --git a/src/main/resources/mails/dataProviderAccessRevoked.html b/src/main/resources/mails/dataProviderAccessRevoked.html
index 5258b784454..29c6c357054 100644
--- a/src/main/resources/mails/dataProviderAccessRevoked.html
+++ b/src/main/resources/mails/dataProviderAccessRevoked.html
@@ -16,7 +16,10 @@
     </style>
 </head>
 <body>
-<p th:text="#{email.assignee-group-changed.greeting(${user.login})}">Dear</p>
+<p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+   th:text="#{email.assignee-group-changed.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+<p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+   th:text="#{email.assignee-group-changed.greetingLogin(${user.login})}">Dear</p>
 <p>
     <span th:text="#{email.data-provider-access-revoked.text1(${projectId})}">Project</span>
     <a th:href="@{|${baseUrl}/${#locale.language}/projects/${projectId}|}" th:text="|${projectId}|">project</a>
diff --git a/src/main/resources/mails/datasetReportGeneratedEmail.html b/src/main/resources/mails/datasetReportGeneratedEmail.html
index 5b7a58f38f7..65610ecceb5 100644
--- a/src/main/resources/mails/datasetReportGeneratedEmail.html
+++ b/src/main/resources/mails/datasetReportGeneratedEmail.html
@@ -18,9 +18,10 @@
 </head>
 <body
 	style="font-family: Roboto, 'Helvetica Neue', sans-serif; color: black;">
-	<p th:text="#{email.dataset-report-generated.greeting(${user.login})}">
-		Liebe(r) rreitmann,</p>
-	<p>
+  <p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+     th:text="#{email.dataset-report-generated.greeting(${user.firstName}, ${user.lastName})}">Liebe(r) rreitmann,</p>
+  <p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+     th:text="#{email.dataset-report-generated.greetingLogin(${user.login})}">Liebe(r) rreitmann,</p>
 	<span th:text="#{email.dataset-report-generated.text(${language})}">Ihr
 		Datensatzreport wurde erfolgreich erzeugt und kann, wenn Sie
 		angemeldet sind, hier betrachted werden:</span>
diff --git a/src/main/resources/mails/passwordResetEmail.html b/src/main/resources/mails/passwordResetEmail.html
index abd1b1de062..d5746c4ca32 100644
--- a/src/main/resources/mails/passwordResetEmail.html
+++ b/src/main/resources/mails/passwordResetEmail.html
@@ -16,7 +16,10 @@
 </style>
 </head>
 <body>
-	<p th:text="#{email.reset.greeting(${user.login})}">Dear</p>
+  <p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+     th:text="#{email.reset.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+  <p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+     th:text="#{email.reset.greetingLogin(${user.login})}">Dear</p>
 	<p>
 		<span th:text="#{email.reset.text1}"> You have requested
 			resetting your password for our Metadatasystem. Please click on the
diff --git a/src/main/resources/mails/removedFromProjectConfiguration.html b/src/main/resources/mails/removedFromProjectConfiguration.html
index 35964b9aebd..8bad7a4bc8f 100644
--- a/src/main/resources/mails/removedFromProjectConfiguration.html
+++ b/src/main/resources/mails/removedFromProjectConfiguration.html
@@ -16,7 +16,10 @@
     </style>
 </head>
 <body>
-<p th:text="#{email.project-configuration-removed.greeting(${user.login})}">Dear</p>
+<p th:if="${user.firstName != null and user.firstName != ''} and ${user.lastName != null and user.lastName != ''}"
+   th:text="#{email.project-configuration-removed.greeting(${user.firstName}, ${user.lastName})}">Dear</p>
+<p th:if="${user.firstName == null or user.firstName == ''} or ${user.lastName == null or user.lastName == ''}"
+   th:text="#{email.project-configuration-removed.greetingLogin(${user.login})}">Dear</p>
 <p>
     <span th:text="#{email.project-configuration-removed.text1}">You have been removed from</span>
     <span th:text="${projectId}">project</span>