diff --git a/src/PostIt/PostIt/Settings/AuthenticationSettings.cs b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
similarity index 95%
rename from src/PostIt/PostIt/Settings/AuthenticationSettings.cs
rename to src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
index 9ebeaebd..8034820d 100644
--- a/src/PostIt/PostIt/Settings/AuthenticationSettings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
@@ -18,11 +18,11 @@ public partial class AuthenticationSettings : ObservableObject
     /// </summary>
     public const string AndroidRedirectUri = "android://postit-signin";
 
-    public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr";
+    public const string DefaultAuthority  = "https://yavsc.pschneider.fr";
 
-    public static string DefaultClientId { get; internal set; } = "postit";
+    public const string DefaultClientId  = "postit";
 
-    public static string[] DefaultScopes { get; set; } = { "blogs"} ;
+    public static readonly string[] DefaultScopes  = { "blogs" };
 
     [ObservableProperty]
     public partial string Authority { get; set; }
diff --git a/src/PostIt/PostIt/ViewModels/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
similarity index 99%
rename from src/PostIt/PostIt/ViewModels/Settings.cs
rename to src/PostIt/PostIt/ViewModels/Settings/Settings.cs
index 8586fa34..f942249b 100644
--- a/src/PostIt/PostIt/ViewModels/Settings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
@@ -314,7 +314,7 @@ public partial class Settings : ViewModelBase
                         settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
                     }
                     else
-                    this.Authentication.Scopes = settings.Authentication.Scopes;
+                        this.Authentication.Scopes = settings.Authentication.Scopes;
                 }
             }
             // A disk load (or an embedded-resource fallback) is the