diff --git a/app/logic/Mail/AutoConfig/saveConfig.ts b/app/logic/Mail/AutoConfig/saveConfig.ts
index f4db6b6e..c96a9f11 100644
--- a/app/logic/Mail/AutoConfig/saveConfig.ts
+++ b/app/logic/Mail/AutoConfig/saveConfig.ts
@@ -1,4 +1,4 @@
-import type { MailAccount } from "../MailAccount";
+import { AuthMethod, type MailAccount } from "../MailAccount";
 import { SQLMailAccount } from "../SQL/SQLMailAccount";
 import { ContactEntry, Person } from "../../Abstract/Person";
 import { Folder, SpecialFolder } from "../../Mail/Folder";
@@ -60,6 +60,10 @@ export function fillConfig(config: MailAccount, emailAddress: string, password:
     }
     fillConfig(config.outgoing, emailAddress, password);
   }
+  if (config.authMethod == AuthMethod.OAuth2) {
+    config.oAuth2.username = config.emailAddress; // Fill oAuth2 username before saving refresh token
+    config.oAuth2.setPassword(password);
+  }
 }
 
 function replaceVar(str: string, emailAddress: string): string {