diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index c37a68fe30..0631fa1a77 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -730,7 +730,8 @@ public class FragmentAccount extends FragmentEx {
                             account.primary = (account.synchronize && primary);
                             account.poll_interval = Integer.parseInt(interval);
 
-                            account.created = now;
+                            if (!update)
+                                account.created = now;
                             if (synchronize)
                                 account.last_connected = now;
 
@@ -935,7 +936,7 @@ public class FragmentAccount extends FragmentEx {
 
         new SimpleTask<EntityAccount>() {
             @Override
-            protected EntityAccount onLoad(Context context, Bundle args) throws Throwable {
+            protected EntityAccount onLoad(Context context, Bundle args) {
                 long id = args.getLong("id");
                 return DB.getInstance(context).account().getAccount(id);
             }
@@ -973,6 +974,9 @@ public class FragmentAccount extends FragmentEx {
                         etPort.setText(Long.toString(account.port));
                     }
 
+                    cbStartTls.setChecked(account == null ? false : account.starttls);
+                    cbInsecure.setChecked(account == null ? false : account.insecure);
+
                     authorized = (account != null && account.auth_type != Helper.AUTH_TYPE_PASSWORD ? account.password : null);
                     etUser.setText(account == null ? null : account.user);
                     tilPassword.getEditText().setText(account == null ? null : account.password);
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index aaa70606fd..f25acf0476 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -603,14 +603,12 @@ public class FragmentIdentity extends FragmentEx {
     public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        final DB db = DB.getInstance(getContext());
-
         Bundle args = new Bundle();
         args.putLong("id", id);
 
         new SimpleTask<EntityIdentity>() {
             @Override
-            protected EntityIdentity onLoad(Context context, Bundle args) throws Throwable {
+            protected EntityIdentity onLoad(Context context, Bundle args) {
                 long id = args.getLong("id");
                 return DB.getInstance(context).identity().getIdentity(id);
             }
@@ -623,6 +621,7 @@ public class FragmentIdentity extends FragmentEx {
                     etReplyTo.setText(identity == null ? null : identity.replyto);
                     etHost.setText(identity == null ? null : identity.host);
                     cbStartTls.setChecked(identity == null ? false : identity.starttls);
+                    cbInsecure.setChecked(identity == null ? false : identity.insecure);
                     etPort.setText(identity == null ? null : Long.toString(identity.port));
                     etUser.setText(identity == null ? null : identity.user);
                     tilPassword.getEditText().setText(identity == null ? null : identity.password);
@@ -674,7 +673,7 @@ public class FragmentIdentity extends FragmentEx {
 
                 new SimpleTask<List<EntityAccount>>() {
                     @Override
-                    protected List<EntityAccount> onLoad(Context context, Bundle args) throws Throwable {
+                    protected List<EntityAccount> onLoad(Context context, Bundle args) {
                         return DB.getInstance(context).account().getAccounts();
                     }