diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index a3857a277d..8da540b4dc 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -280,7 +280,7 @@ public class EmailService implements AutoCloseable {
                 account.certificate_alias, account.fingerprint);
         if (password != null) {
             DB db = DB.getInstance(context);
-            int count = db.account().setAccountPassword(account.id, account.password);
+            int count = db.account().setAccountPassword(account.id, password);
             Log.i(account.name + " token refreshed=" + count);
         }
     }
@@ -293,7 +293,7 @@ public class EmailService implements AutoCloseable {
                 identity.certificate_alias, identity.fingerprint);
         if (password != null) {
             DB db = DB.getInstance(context);
-            int count = db.identity().setIdentityPassword(identity.id, identity.password);
+            int count = db.identity().setIdentityPassword(identity.id, password);
             Log.i(identity.email + " token refreshed=" + count);
         }
     }