diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
index e6f4be85a..65d95738e 100644
--- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -179,10 +179,6 @@ public class AndroidUtilities {
     return !atLeastJellybean();
   }
 
-  public static boolean preMarshmallow() {
-    return !atLeastMarshmallow();
-  }
-
   public static boolean preOreo() {
     return !atLeastOreo();
   }
diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
index 6aeef3ab7..19b4fd1aa 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
@@ -1,7 +1,6 @@
 package org.tasks.caldav;
 
 import static android.text.TextUtils.isEmpty;
-import static com.todoroo.andlib.utility.AndroidUtilities.preMarshmallow;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -98,11 +97,6 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
     caldavAccount = getIntent().getParcelableExtra(EXTRA_CALDAV_DATA);
 
     if (savedInstanceState == null) {
-      if (caldavAccount == null) {
-        if (preMarshmallow()) {
-          passwordLayout.setError(getString(R.string.encryption_warning));
-        }
-      }
       if (caldavAccount != null) {
         name.setText(caldavAccount.getName());
         url.setText(caldavAccount.getUrl());
@@ -293,6 +287,7 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
     Timber.d("Found principal: %s", principal);
 
     CaldavAccount newAccount = new CaldavAccount();
+    newAccount.setName(getNewName());
     newAccount.setUrl(principal);
     newAccount.setUsername(getNewUsername());
     newAccount.setPassword(encryption.encrypt(getNewPassword()));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 659303deb..bab96f213 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -899,6 +899,5 @@ File %1$s contained %2$s.\n\n
   <string name="pro_multiple_google_task_accounts">Multiple Google Task accounts</string>
   <string name="pro_tasker_plugins">Tasker plugins</string>
   <string name="pro_dashclock_extension">Dashclock extension</string>
-  <string name="encryption_warning">Passwords are stored in plain text on devices running Android 5 or below. This is a security concern if your device has been rooted.</string>
 
 </resources>