diff --git a/backend/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs b/backend/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs
index 4a35b03d4..bd7c88856 100644
--- a/backend/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs
+++ b/backend/extensions/Squidex.Extensions/Actions/Email/EmailAction.cs
@@ -35,17 +35,17 @@ namespace Squidex.Extensions.Actions.Email
         [DataType(DataType.Text)]
         public bool ServerUseSsl { get; set; }
 
-        [Required]
-        [Display(Name = "Password", Description = "The password for the SMTP server.")]
-        [DataType(DataType.Password)]
-        public string ServerPassword { get; set; }
-
         [Required]
         [Display(Name = "Username", Description = "The username for the SMTP server.")]
         [DataType(DataType.Text)]
         [Formattable]
         public string ServerUsername { get; set; }
 
+        [Required]
+        [Display(Name = "Password", Description = "The password for the SMTP server.")]
+        [DataType(DataType.Password)]
+        public string ServerPassword { get; set; }
+
         [Required]
         [Display(Name = "From Address", Description = "The email sending address.")]
         [DataType(DataType.Text)]
diff --git a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
index 69e9726a2..ea23d1eae 100644
--- a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
+++ b/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
@@ -59,8 +59,8 @@ namespace Squidex.Extensions.Actions.Email
                 using (ct.Register(client.SendAsyncCancel))
                 {
                     await client.SendMailAsync(
-                        job.MessageBody,
-                        job.MessageBody,
+                        job.MessageFrom,
+                        job.MessageTo,
                         job.MessageSubject,
                         job.MessageBody);
                 }
diff --git a/frontend/app/features/rules/pages/rules/rule-wizard.component.html b/frontend/app/features/rules/pages/rules/rule-wizard.component.html
index ba85abafd..abff3fc4b 100644
--- a/frontend/app/features/rules/pages/rules/rule-wizard.component.html
+++ b/frontend/app/features/rules/pages/rules/rule-wizard.component.html
@@ -126,16 +126,15 @@
     </ng-container>
 
     <ng-container footer>
-        <div>            
-            <ng-container *ngIf="step === 2">
-                <button type="reset" class="float-left btn btn-secondary" (click)="emitComplete()">Cancel</button>
-                <button type="submit" class="float-right btn btn-primary" (click)="saveTrigger()" *ngIf="isEditable">Save</button>
-            </ng-container>
+        <ng-container *ngIf="step === 2 || step === 4">
+            <button type="reset" class="float-left btn btn-secondary" (click)="emitComplete()">Cancel</button>
+        </ng-container>
 
-            <ng-container *ngIf="step === 4">
-                <button type="reset" class="float-left btn btn-secondary" (click)="emitComplete()">Cancel</button>
-                <button type="submit" class="float-right btn btn-primary" (click)="saveAction()" *ngIf="isEditable">Save</button>
-            </ng-container>
-        </div>
+        <ng-container *ngIf="isEditable">
+            <button *ngIf="step === 2 &&  isWizard" type="submit" class="float-right btn btn-primary" (click)="saveTrigger()">Next</button>
+            <button *ngIf="step === 2 && !isWizard" type="submit" class="float-right btn btn-primary" (click)="saveTrigger()">Save</button>
+
+            <button *ngIf="step === 4" type="submit" class="float-right btn btn-primary" (click)="saveAction()">Save</button>
+        </ng-container>
     </ng-container>
 </sqx-modal-dialog>
\ No newline at end of file