diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html
index b777687963..ac6a3f359b 100644
--- a/src/popup/send/send-add-edit.component.html
+++ b/src/popup/send/send-add-edit.component.html
@@ -124,12 +124,13 @@
                         <div class="flex flex-grow" *ngIf="!isDateTimeLocalSupported">
                             <input id="deletionDateCustomFallback" type="date"
                                 name="DeletionDateFallback" [(ngModel)]="deletionDateFallback" required
-                                placeholder="MM/DD/YYYY" [readOnly]="disableSend">
+                                placeholder="MM/DD/YYYY" [readOnly]="disableSend"
+                                data-date-format="mm/dd/yyyy" >
                             <input *ngIf="!isSafari" id="deletionTimeCustomFallback" type="time"
                                 name="DeletionTimeDate" [(ngModel)]="deletionTimeFallback" required
                                 placeholder="HH:MM AM/PM" [readOnly]="disableSend">
                             <select *ngIf="isSafari" id="deletionTimeCustomFallback" [(ngModel)]="safariDeletionTime" name="SafariDeletionTime">
-                                <option *ngFor="let o of safariTimeOptions('deletion')" [value]="o.military">{{o.standard}}</option>
+                                <option *ngFor="let o of safariDeletionTimeOptions" [value]="o.military">{{o.standard}}</option>
                             </select>
                         </div>
                     </ng-template>
@@ -171,12 +172,13 @@
                         <div class="flex flex-grow" *ngIf="!isDateTimeLocalSupported">
                             <input id="expirationDateCustomFallback" type="date"
                                 name="ExpirationDateFallback" [(ngModel)]="expirationDateFallback" [required]="!editMode"
-                                placeholder="MM/DD/YYYY" [readOnly]="disableSend" (change)="expirationDateFallbackChanged()">
+                                placeholder="MM/DD/YYYY" [readOnly]="disableSend" (change)="expirationDateFallbackChanged()"
+                                data-date-format="mm/dd/yyyy" >
                             <input *ngIf="!isSafari" id="expirationTimeCustomFallback" type="time"
                                 name="ExpirationTimeFallback" [(ngModel)]="expirationTimeFallback" [required]="!editMode"
                                 placeholder="HH:MM AM/PM" [readOnly]="disableSend">
                             <select *ngIf="isSafari" id="expirationTimeCustomFallback" [(ngModel)]="safariExpirationTime" name="SafariExpirationTime">
-                                <option *ngFor="let o of safariTimeOptions('deletion')" [value]="o.military">{{o.standard}}</option>
+                                <option *ngFor="let o of safariExpirationTimeOptions" [value]="o.military">{{o.standard}}</option>
                             </select>
                         </div>
                     </ng-template>