diff --git a/src/app/pages/email-distribution-entry/email-distribution-entry.component.html b/src/app/pages/email-distribution-entry/email-distribution-entry.component.html
index fc2beea..dc43483 100644
--- a/src/app/pages/email-distribution-entry/email-distribution-entry.component.html
+++ b/src/app/pages/email-distribution-entry/email-distribution-entry.component.html
@@ -25,7 +25,7 @@
       <div class="row">
         <div class="col-md-12">
           <input autofocus maxlength="256" type="text" name="emailAddress" id="emailAddress" class="form-control" list="emailsFromGridMeasure"
-            [(ngModel)]="emailDistributionEntry.emailAddress" required pattern="^[_A-Za-z0-9-+]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$"
+            [(ngModel)]="emailDistributionEntry.emailAddress" pattern="^[_A-Za-z0-9-+]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$"
             autocomplete="off" />
           <datalist id="emailsFromGridMeasure">
             <option *ngFor="let emailString of emailsFromGridMeasure" [ngValue]="emailString">{{emailString}}</option>
@@ -43,4 +43,4 @@
       </div>
     </fieldset>
   </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/pages/email-distribution-entry/email-distribution-entry.component.ts b/src/app/pages/email-distribution-entry/email-distribution-entry.component.ts
index 2ab11d6..33633a8 100644
--- a/src/app/pages/email-distribution-entry/email-distribution-entry.component.ts
+++ b/src/app/pages/email-distribution-entry/email-distribution-entry.component.ts
@@ -125,13 +125,11 @@
         this.gridMeasureDetail.listEmailDistribution = [...this.gridMeasureDetail.listEmailDistribution, emailDistributionEntryDeepCopy];
         this.storageInProgress = false;
       } else {
-        // this.messageService.emitWarning('Die Email-Adresse ist schon in der Liste vorhanden!', MessageScopeEn.local);
         this.toasterMessageService.showWarn('Die Email-Adresse ist schon in der Liste vorhanden!');
       }
 
     } else {
-      this.toasterMessageService.showWarn('Bitte alle Felder im Email-Verteiler-Eintrag aufüllen!');
-      // this.messageService.emitWarning('Bitte alle Felder im Email-Verteiler-Eintrag aufüllen!', MessageScopeEn.local);
+      this.toasterMessageService.showWarn('Bitte valide Email-Adresse eintragen!');
     }
 
   }
diff --git a/src/app/pages/step/step.component.ts b/src/app/pages/step/step.component.ts
index 90a3fa3..f99e50f 100644
--- a/src/app/pages/step/step.component.ts
+++ b/src/app/pages/step/step.component.ts
@@ -121,7 +121,6 @@
         this.singleGridMeasure.listSteps = new Array();
         stepDeepCopy.sortorder = 1;
       } else {
-        // stepDeepCopy.sortorder = this.singleGridMeasure.listSteps.length + 1;
         stepDeepCopy.sortorder = this.singleGridMeasure.listSteps[this.singleGridMeasure.listSteps.length - 1].sortorder + 1;
       }
 
@@ -132,7 +131,7 @@
 
       this.storageInProgress = false;
     } else {
-      this.toasterMessageService.showWarn('Bitte das Pflichtfeld "Objekt der Schaltung" in der Schrittsequenz ausfüllen!');
+      this.toasterMessageService.showWarn('Bitte das Pflichtfeld "Objekt der Schaltung" für die Schrittsequenz ausfüllen!');
     }
 
   }