Merge branch 'release/2.3.0' into develop

2 files changed, 3 insertions, 3 deletions

diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html
index 48b5681f4..ce603459e 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.html
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html
@@ -44,8 +44,8 @@
 
       <td class="action-cell">
         <ng-container *ngIf="follow.state === 'pending'">
-          <my-button i18n-label label="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button>
-          <my-button i18n-label label="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button>
+          <my-button i18n-title title="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button>
+          <my-button i18n-title title="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button>
         </ng-container>
 
         <my-delete-button *ngIf="follow.state === 'accepted'" (click)="deleteFollower(follow)"></my-delete-button>
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index 2e7b322ca..d103f8e2f 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -95,7 +95,7 @@
         <input
           type="text" id="email" i18n-placeholder placeholder="mail@example.com" class="form-control"
           formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
-          autocomplete="off" [readonly]="user.pluginAuth !== null"
+          autocomplete="off" [readonly]="user && user.pluginAuth !== null"
         >
         <div *ngIf="formErrors.email" class="form-error">
           {{ formErrors.email }}