diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 33b7b7826..182ca8571 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -1455,10 +1455,10 @@ Achtung: diese Aufgaben sind unwiederbringlich verloren, wenn Sie kein Backup ge
   <string name="TEA_reminder_mode_once">Einmal klingeln</string>
 
   <!-- Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Ring Five Times</string>
+  <string name="TEA_reminder_mode_five">Fünfmal klingeln</string>
 
   <!-- Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Klingeln, bis ich den Arlarm abschalte</string>
+  <string name="TEA_reminder_mode_nonstop">Klingeln, bis ich den Alarm abschalte</string>
 
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index fb07fbfc1..b8e1f0942 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -224,9 +224,10 @@ public class TaskDao extends DatabaseDao<Task> {
                             0));
         }
         if(!item.containsValue(Task.REMINDER_FLAGS)) {
-            item.setValue(Task.REMINDER_FLAGS,
-                    Preferences.getIntegerFromString(R.string.p_default_reminders_key,
-                            Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE));
+            int reminder_flags = Preferences.getIntegerFromString(R.string.p_default_reminders_key,
+                    Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE) |
+                    Preferences.getIntegerFromString(R.string.p_default_reminders_mode_key, 0);
+            item.setValue(Task.REMINDER_FLAGS, reminder_flags);
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
index 466624c8f..cc57ba052 100644
--- a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -6,7 +6,6 @@ import android.widget.CheckBox;
 import android.widget.Spinner;
 
 import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
 import com.todoroo.astrid.data.Task;
 
@@ -46,16 +45,10 @@ public class ReminderControlSet implements TaskEditControlSet {
         after.setChecked((flags &
                 Task.NOTIFY_AFTER_DEADLINE) > 0);
 
-        int rmd_mode_default = Preferences.getIntegerFromString(R.string.p_default_reminders_mode_key, 0);
-
         if((flags & Task.NOTIFY_MODE_NONSTOP) > 0)
             mode.setSelection(2);
         else if((flags & Task.NOTIFY_MODE_FIVE) > 0)
             mode.setSelection(1);
-        else if((rmd_mode_default & Task.NOTIFY_MODE_NONSTOP) > 0)
-            mode.setSelection(2);
-        else if((rmd_mode_default & Task.NOTIFY_MODE_FIVE) > 0)
-            mode.setSelection(1);
         else
             mode.setSelection(0);
     }