diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 94da08844..1734e80e6 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -422,7 +422,7 @@ public class RepeatControlSet extends PopupControlSet {
                     arrayResource);
         String date = String.format("%s %s", repeatValue, dates[intervalValue]); //$NON-NLS-1$
         if (repeatUntilValue > 0) {
-            return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, false, false));
+            return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, true, true));
         } else {
             return activity.getString(R.string.repeat_detail_duedate, date); // Every freq int
         }
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
index 2e5d1cabd..a39ace401 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
@@ -99,9 +99,7 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
     }
 
     static boolean repeatFinished(long newDueDate, long repeatUntil) {
-        return repeatUntil > 0 && newDateTime(repeatUntil).getMillisOfDay() == 0
-                ? newDateTime(newDueDate).withMillisOfDay(0).isAfter(repeatUntil)
-                : newDueDate >= repeatUntil;
+        return repeatUntil > 0 && newDateTime(newDueDate).withMillisOfDay(0).isAfter(newDateTime(repeatUntil).withMillisOfDay(0));
     }
 
     public static void rescheduleTask(Context context, GCalHelper gcalHelper, TaskService taskService, Task task, long newDueDate) {