diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountsManager.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountsManager.swift
index da2a8e41..313afb80 100644
--- a/Packages/AppAccount/Sources/AppAccount/AppAccountsManager.swift
+++ b/Packages/AppAccount/Sources/AppAccount/AppAccountsManager.swift
@@ -3,8 +3,10 @@ import Network
 import Env
 import Models
 
+@MainActor
 public class AppAccountsManager: ObservableObject {
-  @AppStorage("latestCurrentAccountKey") static public var latestCurrentAccountKey: String = ""
+  @AppStorage("latestCurrentAccountKey", store: UserPreferences.sharedDefault)
+  static public var latestCurrentAccountKey: String = ""
   
   @Published public var currentAccount: AppAccount {
     didSet {
diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift
index 2f5230a9..98c9a58b 100644
--- a/Packages/Env/Sources/Env/UserPreferences.swift
+++ b/Packages/Env/Sources/Env/UserPreferences.swift
@@ -5,7 +5,7 @@ import Network
 
 @MainActor
 public class UserPreferences: ObservableObject {
-  private static let sharedDefault = UserDefaults.init(suiteName: "group.icecubesapps")
+  public static let sharedDefault = UserDefaults.init(suiteName: "group.icecubesapps")
   
   private var client: Client?