diff --git a/extensions/vscode-account/src/keychain.ts b/extensions/vscode-account/src/keychain.ts
index a53d848c76c..28cd962a2ab 100644
--- a/extensions/vscode-account/src/keychain.ts
+++ b/extensions/vscode-account/src/keychain.ts
@@ -6,6 +6,7 @@
 // keytar depends on a native module shipped in vscode, so this is
 // how we load it
 import * as keytarType from 'keytar';
+import { env } from 'vscode';
 
 function getKeytar(): Keytar | undefined {
 	try {
@@ -23,7 +24,7 @@ export type Keytar = {
 	deletePassword: typeof keytarType['deletePassword'];
 };
 
-const SERVICE_ID = 'vscode.login';
+const SERVICE_ID = `${env.uriScheme}-vscode.login`;
 const ACCOUNT_ID = 'account';
 
 export class Keychain {