diff --git a/MacPass/MPDatePickingViewController.m b/MacPass/MPDatePickingViewController.m
index ef74ba45..1564c60d 100644
--- a/MacPass/MPDatePickingViewController.m
+++ b/MacPass/MPDatePickingViewController.m
@@ -68,7 +68,7 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
     [presetMenu addItem:item];
   }
   
-  self.datePicker.dateValue = [NSDate date];
+  self.datePicker.dateValue = self.representedObject ? [self.representedObject timeInfo].expirationDate : NSDate.date;
   self.presetPopupButton.menu = presetMenu;
 }