diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 6129378f25..422c68bd90 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -475,15 +475,11 @@ public class FragmentSetup extends FragmentBase {
     }
 
     private void onAccountSelected(Intent data) {
-        Log.i("Selected " + data);
-        Log.logExtras(data);
-
         String name = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
         String type = data.getStringExtra(AccountManager.KEY_ACCOUNT_TYPE);
 
         AccountManager am = AccountManager.get(getContext());
         Account[] accounts = am.getAccountsByType(type);
-        Log.i("Accounts=" + accounts.length);
         for (final Account account : accounts)
             if (name.equals(account.name)) {
                 Snackbar.make(view, R.string.title_authorizing, Snackbar.LENGTH_LONG).show();
@@ -499,11 +495,12 @@ public class FragmentSetup extends FragmentBase {
                                 try {
                                     Bundle bundle = future.getResult();
                                     String token = bundle.getString(AccountManager.KEY_AUTHTOKEN);
-                                    Log.i("Got token=" + token);
+                                    Log.i("Got token");
                                     onAuthorized(name, token);
                                 } catch (Throwable ex) {
                                     if (ex instanceof AccountsException || ex instanceof IOException) {
-                                        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
+                                        Log.w(ex);
+                                        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                                             Snackbar.make(view, Helper.formatThrowable(ex), Snackbar.LENGTH_LONG).show();
                                     } else {
                                         Log.e(ex);
diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 7a07ef78fc..26f479e391 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -165,21 +165,21 @@ public class MailService implements AutoCloseable {
                         if (user.equals(account.name)) {
                             Log.i("Refreshing token user=" + user);
                             am.invalidateAuthToken(type, password);
-                            String refreshed = am.blockingGetAuthToken(account, getAuthTokenType(type), true);
-                            if (refreshed == null)
-                                throw new IllegalStateException("no token");
+                            String token = am.blockingGetAuthToken(account, getAuthTokenType(type), true);
+                            if (token == null)
+                                throw new IllegalArgumentException("no token");
 
                             int count = 0;
                             DB db = DB.getInstance(context);
                             if ("imap".equals(protocol) || "imaps".equals(protocol))
-                                count = db.account().updateAccountPassword(password, refreshed);
+                                count = db.account().updateAccountPassword(password, token);
                             else if ("smtp".equals(protocol) || "smtps".equals(protocol))
-                                count = db.identity().updateIdentityPassword(password, refreshed);
+                                count = db.identity().updateIdentityPassword(password, token);
 
                             if (count != 1)
-                                throw new IllegalStateException(protocol + "=" + count);
+                                throw new IllegalArgumentException(protocol + "=" + count);
 
-                            _connect(context, host, port, user, refreshed);
+                            _connect(context, host, port, user, token);
                             break;
                         }
                 } catch (Throwable ex1) {