From 3952a268d12b9d66a1299b413599667aaca7c442 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Fri, 2 Feb 2024 09:44:56 +0100
Subject: [PATCH 1/3] Debugger - Fixed current renderer always showing as
 Software

Render service - Log which renderer is used
Updating - Fixed release not loading when viewing it from the desktop notification
Core - Removed old unused code
Data model event cycle node - Fixed crash on shutdown
---
 src/Artemis.Core/Constants.cs                 |   6 -
 src/Artemis.Core/Models/Profile/Renderer.cs   | 117 ------------------
 src/Artemis.Core/Services/RenderService.cs    |   1 +
 .../WindowsUpdateNotificationProvider.cs      |   4 +-
 .../Performance/PerformanceDebugViewModel.cs  |   2 +-
 .../Tabs/Render/RenderDebugViewModel.cs       |   2 +-
 .../Steps/UploadStepViewModel.cs              |   4 +-
 .../DataModel/DataModelEventCycleNode.cs      |  21 +++-
 8 files changed, 23 insertions(+), 134 deletions(-)
 delete mode 100644 src/Artemis.Core/Models/Profile/Renderer.cs

diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
index 8386f5fcf..ce374ca88 100644
--- a/src/Artemis.Core/Constants.cs
+++ b/src/Artemis.Core/Constants.cs
@@ -155,10 +155,4 @@ public static class Constants
     ///     Gets the startup arguments provided to the application
     /// </summary>
     public static ReadOnlyCollection<string> StartupArguments { get; set; } = null!;
-
-    /// <summary>
-    ///     Gets the graphics context to be used for rendering by SkiaSharp.
-    /// </summary>
-    public static IManagedGraphicsContext? ManagedGraphicsContext { get; internal set; }
-    
 }
\ No newline at end of file
diff --git a/src/Artemis.Core/Models/Profile/Renderer.cs b/src/Artemis.Core/Models/Profile/Renderer.cs
deleted file mode 100644
index b72d48319..000000000
--- a/src/Artemis.Core/Models/Profile/Renderer.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using SkiaSharp;
-
-namespace Artemis.Core;
-
-internal class Renderer : IDisposable
-{
-    private bool _disposed;
-    private SKRect _lastBounds;
-    private GRContext? _lastGraphicsContext;
-    private SKRect _lastParentBounds;
-    private bool _valid;
-    public SKSurface? Surface { get; private set; }
-    public SKPaint? Paint { get; private set; }
-    public SKPath? Path { get; private set; }
-    public SKPoint TargetLocation { get; private set; }
-
-    public bool IsOpen { get; private set; }
-
-    /// <summary>
-    ///     Opens the render context using the dimensions of the provided path
-    /// </summary>
-    public void Open(SKPath path, Folder? parent)
-    {
-        if (_disposed)
-            throw new ObjectDisposedException("Renderer");
-
-        if (IsOpen)
-            throw new ArtemisCoreException("Cannot open render context because it is already open");
-
-        if (path.Bounds != _lastBounds || (parent != null && parent.Bounds != _lastParentBounds) || _lastGraphicsContext != Constants.ManagedGraphicsContext?.GraphicsContext)
-            Invalidate();
-
-        if (!_valid || Surface == null)
-        {
-            SKRect pathBounds = path.Bounds;
-            int width = (int) pathBounds.Width;
-            int height = (int) pathBounds.Height;
-
-            SKImageInfo imageInfo = new(width, height);
-            if (Constants.ManagedGraphicsContext?.GraphicsContext == null)
-                Surface = SKSurface.Create(imageInfo);
-            else
-                Surface = SKSurface.Create(Constants.ManagedGraphicsContext.GraphicsContext, true, imageInfo);
-
-            Path = new SKPath(path);
-            Path.Transform(SKMatrix.CreateTranslation(pathBounds.Left * -1, pathBounds.Top * -1));
-
-            TargetLocation = new SKPoint(pathBounds.Location.X, pathBounds.Location.Y);
-            if (parent != null)
-                TargetLocation -= parent.Bounds.Location;
-
-            Surface.Canvas.ClipPath(Path);
-
-            _lastParentBounds = parent?.Bounds ?? new SKRect();
-            _lastBounds = path.Bounds;
-            _lastGraphicsContext = Constants.ManagedGraphicsContext?.GraphicsContext;
-            _valid = true;
-        }
-
-        Paint = new SKPaint();
-
-        Surface.Canvas.Clear();
-        Surface.Canvas.Save();
-
-        IsOpen = true;
-    }
-
-    public void Close()
-    {
-        if (_disposed)
-            throw new ObjectDisposedException("Renderer");
-
-        Surface?.Canvas.Restore();
-
-        // Looks like every part of the paint needs to be disposed :(
-        Paint?.ColorFilter?.Dispose();
-        Paint?.ImageFilter?.Dispose();
-        Paint?.MaskFilter?.Dispose();
-        Paint?.PathEffect?.Dispose();
-        Paint?.Dispose();
-
-        Paint = null;
-
-        IsOpen = false;
-    }
-
-    public void Invalidate()
-    {
-        if (_disposed)
-            throw new ObjectDisposedException("Renderer");
-
-        _valid = false;
-    }
-
-    ~Renderer()
-    {
-        if (IsOpen)
-            Close();
-    }
-
-    public void Dispose()
-    {
-        if (IsOpen)
-            Close();
-
-        Surface?.Dispose();
-        Paint?.Dispose();
-        Path?.Dispose();
-
-        Surface = null;
-        Paint = null;
-        Path = null;
-
-        _disposed = true;
-    }
-}
\ No newline at end of file
diff --git a/src/Artemis.Core/Services/RenderService.cs b/src/Artemis.Core/Services/RenderService.cs
index 26e23ca6f..bd73a0f0d 100644
--- a/src/Artemis.Core/Services/RenderService.cs
+++ b/src/Artemis.Core/Services/RenderService.cs
@@ -123,6 +123,7 @@ internal class RenderService : IRenderService, IRenderer, IDisposable
             return;
         }
 
+        _logger.Information("Applying {Name} graphics context", _preferredGraphicsContext.Value);
         if (_preferredGraphicsContext.Value == "Software")
         {
             GraphicsContext = null;
diff --git a/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs b/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs
index 8ca86dd87..ed241cf62 100644
--- a/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs
+++ b/src/Artemis.UI.Windows/Providers/WindowsUpdateNotificationProvider.cs
@@ -60,10 +60,10 @@ public class WindowsUpdateNotificationProvider : IUpdateNotificationProvider
         Dispatcher.UIThread.Invoke(async () =>
         {
             _mainWindowService.OpenMainWindow();
-            if (releaseId != null)
+            if (releaseId != null && releaseId.Value != Guid.Empty)
                 await _router.Navigate($"settings/releases/{releaseId}");
             else
-                await _router.Navigate($"settings/releases");
+                await _router.Navigate("settings/releases");
         });
     }
 
diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs
index cefb569dc..0b2bd65a9 100644
--- a/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs
+++ b/src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs
@@ -63,7 +63,7 @@ public partial class PerformanceDebugViewModel : ActivatableViewModelBase
     
     private void HandleActivation()
     {
-        Renderer = Constants.ManagedGraphicsContext != null ? Constants.ManagedGraphicsContext.GetType().Name : "Software";
+        Renderer = _renderService.GraphicsContext?.GetType().Name ?? "Software";
         _renderService.FrameRendered += RenderServiceOnFrameRendered;
     }
 
diff --git a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs
index b4594eee3..dbf76e823 100644
--- a/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs
+++ b/src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs
@@ -35,7 +35,7 @@ public partial class RenderDebugViewModel : ActivatableViewModelBase
 
     private void HandleActivation()
     {
-        Renderer = Constants.ManagedGraphicsContext != null ? Constants.ManagedGraphicsContext.GetType().Name : "Software";
+        Renderer = _renderService.GraphicsContext?.GetType().Name ?? "Software";
         _renderService.FrameRendered += RenderServiceOnFrameRendered;
     }
 
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
index 2a21cde43..04eae8c0f 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
@@ -82,8 +82,8 @@ public partial class UploadStepViewModel : SubmissionViewModel
             FailureMessage = e.Message;
             Failed = true;
 
-            // If something went wrong halfway through, delete the entry
-            if (_entryId != null)
+            // If something went wrong halfway through, delete the entry if it was new
+            if (State.EntryId == null && _entryId != null)
                 await _workshopClient.RemoveEntry.ExecuteAsync(_entryId.Value, CancellationToken.None);
         }
         finally
diff --git a/src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventCycleNode.cs b/src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventCycleNode.cs
index b0c8b684a..6ab264a77 100644
--- a/src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventCycleNode.cs
+++ b/src/Artemis.VisualScripting/Nodes/DataModel/DataModelEventCycleNode.cs
@@ -11,6 +11,7 @@ public class DataModelEventCycleNode : Node<DataModelPathEntity, DataModelEventC
     private int _currentIndex;
     private Type _currentType;
     private DataModelPath? _dataModelPath;
+    private IDataModelEvent? _subscribedEvent;
     private object? _lastPathValue;
     private bool _updating;
 
@@ -76,13 +77,19 @@ public class DataModelEventCycleNode : Node<DataModelPathEntity, DataModelEventC
     {
         DataModelPath? old = _dataModelPath;
 
-        if (old?.GetValue() is IDataModelEvent oldEvent)
-            oldEvent.EventTriggered -= OnEventTriggered;
+        if (_subscribedEvent != null)
+        {
+            _subscribedEvent.EventTriggered -= OnEventTriggered;
+            _subscribedEvent = null;
+        }
 
         _dataModelPath = Storage != null ? new DataModelPath(Storage) : null;
 
         if (_dataModelPath?.GetValue() is IDataModelEvent newEvent)
-            newEvent.EventTriggered += OnEventTriggered;
+        {
+            _subscribedEvent = newEvent;
+            _subscribedEvent.EventTriggered += OnEventTriggered;
+        }
 
         old?.Dispose();
     }
@@ -153,8 +160,12 @@ public class DataModelEventCycleNode : Node<DataModelPathEntity, DataModelEventC
     /// <inheritdoc />
     public void Dispose()
     {
-        if (_dataModelPath?.GetValue() is IDataModelEvent newEvent)
-            newEvent.EventTriggered -= OnEventTriggered;
+        if (_subscribedEvent != null)
+        {
+            _subscribedEvent.EventTriggered -= OnEventTriggered;
+            _subscribedEvent = null;
+        }
+
         _dataModelPath?.Dispose();
     }
 }
\ No newline at end of file

From a2fe5d5d083fffa301c3c76b383f3e37dcc19e53 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Thu, 8 Feb 2024 20:58:16 +0100
Subject: [PATCH 2/3] Settings - Added account management

---
 src/Artemis.UI/Routing/Routes.cs              |   1 +
 .../LayoutProviders/WorkshopLayoutView.axaml  |   5 +-
 .../WorkshopLayoutViewModel.cs                |   1 +
 .../Account/ChangeEmailAddressView.axaml      |  14 ++
 .../Account/ChangeEmailAddressView.axaml.cs   |  16 +++
 .../Account/ChangeEmailAddressViewModel.cs    |  50 ++++++++
 .../Settings/Account/ChangePasswordView.axaml |  17 +++
 .../Account/ChangePasswordView.axaml.cs       |  17 +++
 .../Account/ChangePasswordViewModel.cs        |  47 +++++++
 .../Settings/Account/RemoveAccountView.axaml  |  14 ++
 .../Account/RemoveAccountView.axaml.cs        |  16 +++
 .../Account/RemoveAccountViewModel.cs         |  52 ++++++++
 .../Screens/Settings/SettingsViewModel.cs     |   1 +
 .../Settings/Tabs/AccountTabView.axaml        | 121 ++++++++++++++++++
 .../Settings/Tabs/AccountTabView.axaml.cs     |  14 ++
 .../Settings/Tabs/AccountTabViewModel.cs      | 105 +++++++++++++++
 .../CurrentUser/CurrentUserView.axaml         |  18 ++-
 .../CurrentUser/CurrentUserView.axaml.cs      |   8 +-
 .../CurrentUser/CurrentUserViewModel.cs       |  10 +-
 .../Entries/Details/EntryReleasesViewModel.cs |   1 +
 .../Dialogs/DeviceSelectionDialogViewModel.cs |   1 +
 .../Workshop/Layout/LayoutDetailsViewModel.cs |   1 +
 .../Library/SubmissionDetailViewModel.cs      |   2 +-
 .../Library/Tabs/InstalledTabItemViewModel.cs |   1 +
 .../Library/Tabs/InstalledTabViewModel.cs     |   1 +
 .../Steps/UploadStepViewModel.cs              |   4 +-
 .../DryIoc/ContainerExtensions.cs             |   8 +-
 .../EntryInstallResult.cs                     |   3 +-
 .../IEntryInstallationHandler.cs              |   1 +
 .../LayoutEntryInstallationHandler.cs         |   1 +
 .../ProfileEntryInstallationHandler.cs        |   1 +
 .../{ImageUploadResult.cs => ApiResult.cs}    |  10 +-
 .../{Services => Models}/AccessToken.cs       |   3 +-
 .../{Services => Models}/InstalledEntry.cs    |   2 +-
 .../Models/PersonalAccessToken.cs             |   3 +
 .../Providers/WorkshopLayoutProvider.cs       |   1 +
 .../Services/AuthenticationService.cs         |   1 +
 .../Interfaces/IUserManagementService.cs      |  16 +++
 .../Services/Interfaces/IWorkshopService.cs   |   5 +-
 .../Services/UserManagementService.cs         | 103 +++++++++++++++
 .../Services/WorkshopService.cs               |  14 +-
 .../WorkshopConstants.cs                      |   1 +
 42 files changed, 681 insertions(+), 30 deletions(-)
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressViewModel.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/ChangePasswordViewModel.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Account/RemoveAccountViewModel.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
 create mode 100644 src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs
 create mode 100644 src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
 rename src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/{ImageUploadResult.cs => ApiResult.cs} (51%)
 rename src/Artemis.WebClient.Workshop/{Services => Models}/AccessToken.cs (92%)
 rename src/Artemis.WebClient.Workshop/{Services => Models}/InstalledEntry.cs (99%)
 create mode 100644 src/Artemis.WebClient.Workshop/Models/PersonalAccessToken.cs
 create mode 100644 src/Artemis.WebClient.Workshop/Services/Interfaces/IUserManagementService.cs
 create mode 100644 src/Artemis.WebClient.Workshop/Services/UserManagementService.cs

diff --git a/src/Artemis.UI/Routing/Routes.cs b/src/Artemis.UI/Routing/Routes.cs
index e129b384c..1d4862f44 100644
--- a/src/Artemis.UI/Routing/Routes.cs
+++ b/src/Artemis.UI/Routing/Routes.cs
@@ -64,6 +64,7 @@ public static class Routes
                         new RouteRegistration<ReleaseDetailsViewModel>("{releaseId:guid}")
                     }
                 },
+                new RouteRegistration<AccountTabViewModel>("account"),
                 new RouteRegistration<AboutTabViewModel>("about")
             }
         },
diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
index 07a8a7325..38c1e2eef 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:services="clr-namespace:Artemis.WebClient.Workshop.Services;assembly=Artemis.WebClient.Workshop"
              xmlns:layoutProviders="clr-namespace:Artemis.UI.Screens.Device.Layout.LayoutProviders"
+             xmlns:models="clr-namespace:Artemis.WebClient.Workshop.Models;assembly=Artemis.WebClient.Workshop"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Device.Layout.LayoutProviders.WorkshopLayoutView"
              x:DataType="layoutProviders:WorkshopLayoutViewModel">
@@ -19,7 +20,7 @@
                     <Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
                         <Setter Property="ContentTemplate">
                             <Setter.Value>
-                                <DataTemplate x:DataType="services:InstalledEntry">
+                                <DataTemplate x:DataType="models:InstalledEntry">
                                     <TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
                                 </DataTemplate>
                             </Setter.Value>
@@ -32,7 +33,7 @@
                           ItemsSource="{CompiledBinding Entries}"
                           PlaceholderText="Select an installed layout">
                     <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="services:InstalledEntry">
+                        <DataTemplate x:DataType="models:InstalledEntry">
                             <StackPanel>
                                 <TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
                                 <TextBlock Classes="subtitle" Text="{CompiledBinding Author}" TextWrapping="Wrap" MaxWidth="350" />
diff --git a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutViewModel.cs
index 426851cdf..65c9c8d93 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutViewModel.cs
@@ -10,6 +10,7 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Providers;
 using Artemis.WebClient.Workshop.Services;
 using PropertyChanged.SourceGenerator;
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml
new file mode 100644
index 000000000..2f933b14b
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml
@@ -0,0 +1,14 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:account="clr-namespace:Artemis.UI.Screens.Settings.Account"
+             mc:Ignorable="d" d:DesignWidth="320" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Settings.Account.ChangeEmailAddressView"
+             x:DataType="account:ChangeEmailAddressViewModel">
+    <StackPanel Spacing="5" Width="300">
+        <Label>New email address</Label>
+        <TextBox Text="{CompiledBinding EmailAddress}" />
+        <TextBlock Classes="subtitle" Margin="0 5 0 0" TextWrapping="Wrap">An email will be sent to the new address to confirm the change.</TextBlock>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs
new file mode 100644
index 000000000..ed3f4a7d0
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressView.axaml.cs
@@ -0,0 +1,16 @@
+using Artemis.UI.Shared.Extensions;
+using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class ChangeEmailAddressView : ReactiveUserControl<ChangeEmailAddressViewModel>
+{
+    public ChangeEmailAddressView()
+    {
+        InitializeComponent();
+        this.WhenActivated(_ => this.ClearAllDataValidationErrors());
+    }
+
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressViewModel.cs b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressViewModel.cs
new file mode 100644
index 000000000..3dc39d788
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangeEmailAddressViewModel.cs
@@ -0,0 +1,50 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reactive;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Services;
+using IdentityModel;
+using PropertyChanged.SourceGenerator;
+using ReactiveUI;
+using ReactiveUI.Validation.Extensions;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class ChangeEmailAddressViewModel : ContentDialogViewModelBase
+{
+    private readonly IUserManagementService _userManagementService;
+    private readonly IWindowService _windowService;
+    [Notify] private string _emailAddress = string.Empty;
+
+    public ChangeEmailAddressViewModel(IUserManagementService userManagementService, IAuthenticationService authenticationService, IWindowService windowService)
+    {
+        _userManagementService = userManagementService;
+        _windowService = windowService;
+        Submit = ReactiveCommand.CreateFromTask(ExecuteSubmit, ValidationContext.Valid);
+
+        string? currentEmail = authenticationService.Claims.FirstOrDefault(c => c.Type == JwtClaimTypes.Email)?.Value;
+        this.ValidationRule(vm => vm.EmailAddress, e => !string.IsNullOrWhiteSpace(e),
+            "You must specify a new email address");
+        this.ValidationRule(vm => vm.EmailAddress, e => string.IsNullOrWhiteSpace(e) || new EmailAddressAttribute().IsValid(e),
+            "You must specify a valid email address");
+        this.ValidationRule(vm => vm.EmailAddress,
+            e => string.IsNullOrWhiteSpace(e) || currentEmail == null || !string.Equals(e, currentEmail, StringComparison.InvariantCultureIgnoreCase),
+            "New email address must be different from the old one");
+    }
+
+    public ReactiveCommand<Unit, Unit> Submit { get; }
+
+    private async Task ExecuteSubmit(CancellationToken cts)
+    {
+        ApiResult result = await _userManagementService.ChangeEmailAddress(EmailAddress, cts);
+        if (result.IsSuccess)
+            await _windowService.ShowConfirmContentDialog("Confirmation required", "Before being applied, you must confirm your new email address. Please check your inbox.", cancel: null);
+        else
+            await _windowService.ShowConfirmContentDialog("Failed to update email address", result.Message ?? "An unexpected error occured", cancel: null);
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml
new file mode 100644
index 000000000..3f350cc23
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml
@@ -0,0 +1,17 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:account="clr-namespace:Artemis.UI.Screens.Settings.Account"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Settings.Account.ChangePasswordView"
+             x:DataType="account:ChangePasswordViewModel">
+    <StackPanel Spacing="5" Width="300">
+        <Label>Current password</Label>
+        <TextBox Text="{CompiledBinding CurrentPassword}" PasswordChar="&#x25CF;"/>
+        <Label>New password</Label>
+        <TextBox Text="{CompiledBinding NewPassword}" PasswordChar="&#x25CF;"/>
+        <Label>New password confirmation</Label>
+        <TextBox Text="{CompiledBinding NewPasswordConfirmation}" PasswordChar="&#x25CF;"/>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs
new file mode 100644
index 000000000..2b13f8a7a
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordView.axaml.cs
@@ -0,0 +1,17 @@
+using Artemis.UI.Shared.Extensions;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class ChangePasswordView : ReactiveUserControl<ChangePasswordViewModel>
+{
+    public ChangePasswordView()
+    {
+        InitializeComponent();
+        this.WhenActivated(_ => this.ClearAllDataValidationErrors());
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/ChangePasswordViewModel.cs b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordViewModel.cs
new file mode 100644
index 000000000..cd405c2c5
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/ChangePasswordViewModel.cs
@@ -0,0 +1,47 @@
+using System.Reactive;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Services;
+using PropertyChanged.SourceGenerator;
+using ReactiveUI;
+using ReactiveUI.Validation.Extensions;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class ChangePasswordViewModel : ContentDialogViewModelBase
+{
+    private readonly IUserManagementService _userManagementService;
+    private readonly IWindowService _windowService;
+    [Notify] private string _currentPassword = string.Empty;
+    [Notify] private string _newPassword = string.Empty;
+    [Notify] private string _newPasswordConfirmation = string.Empty;
+
+    public ChangePasswordViewModel(IUserManagementService userManagementService, IWindowService windowService)
+    {
+        _userManagementService = userManagementService;
+        _windowService = windowService;
+        Submit = ReactiveCommand.CreateFromTask(ExecuteSubmit, ValidationContext.Valid);
+        
+        this.ValidationRule(vm => vm.CurrentPassword, e => !string.IsNullOrWhiteSpace(e), "You must specify your current password");
+        this.ValidationRule(vm => vm.NewPassword, e => !string.IsNullOrWhiteSpace(e), "You must specify a new password");
+        this.ValidationRule(
+            vm => vm.NewPasswordConfirmation,
+            this.WhenAnyValue(vm => vm.NewPassword, vm => vm.NewPasswordConfirmation, (password, confirmation) => password == confirmation),
+            "The passwords must match"
+        );
+    }
+
+    public ReactiveCommand<Unit, Unit> Submit { get; }
+
+    private async Task ExecuteSubmit(CancellationToken cts)
+    {
+        ApiResult result = await _userManagementService.ChangePassword(CurrentPassword, NewPassword, cts);
+        if (result.IsSuccess)
+            await _windowService.ShowConfirmContentDialog("Password changed", "Your password has been changed", cancel: null);
+        else
+            await _windowService.ShowConfirmContentDialog("Failed to change password", result.Message ?? "An unexpected error occured", cancel: null);
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml
new file mode 100644
index 000000000..c53b8505d
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml
@@ -0,0 +1,14 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:account="clr-namespace:Artemis.UI.Screens.Settings.Account"
+             mc:Ignorable="d" d:DesignWidth="320" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.Settings.Account.RemoveAccountView"
+             x:DataType="account:RemoveAccountViewModel">
+    <StackPanel Spacing="5" Width="350">
+        <Label>Please enter your email address to confirm</Label>
+        <TextBox Text="{CompiledBinding EmailAddress}"/>
+        <TextBlock Classes="danger" Margin="0 5 0 0" TextWrapping="Wrap">This is a destructive action that cannot be undone.</TextBlock>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs
new file mode 100644
index 000000000..5c4491cab
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountView.axaml.cs
@@ -0,0 +1,16 @@
+using Artemis.UI.Shared.Extensions;
+using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class RemoveAccountView : ReactiveUserControl<RemoveAccountViewModel>
+{
+    public RemoveAccountView()
+    {
+        InitializeComponent();
+        this.WhenActivated(_ => this.ClearAllDataValidationErrors());
+    }
+
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Account/RemoveAccountViewModel.cs b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountViewModel.cs
new file mode 100644
index 000000000..cff7e35ed
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Account/RemoveAccountViewModel.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Reactive;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Services;
+using IdentityModel;
+using PropertyChanged.SourceGenerator;
+using ReactiveUI;
+using ReactiveUI.Validation.Extensions;
+
+namespace Artemis.UI.Screens.Settings.Account;
+
+public partial class RemoveAccountViewModel : ContentDialogViewModelBase
+{
+    private readonly IUserManagementService _userManagementService;
+    private readonly IAuthenticationService _authenticationService;
+    private readonly IWindowService _windowService;
+    [Notify] private string _emailAddress = string.Empty;
+
+    public RemoveAccountViewModel(IUserManagementService userManagementService, IAuthenticationService authenticationService, IWindowService windowService)
+    {
+        _userManagementService = userManagementService;
+        _authenticationService = authenticationService;
+        _windowService = windowService;
+
+        Submit = ReactiveCommand.CreateFromTask(ExecuteSubmit, ValidationContext.Valid);
+        string? currentEmail = authenticationService.Claims.FirstOrDefault(c => c.Type == JwtClaimTypes.Email)?.Value;
+        
+        this.ValidationRule(vm => vm.EmailAddress, e => !string.IsNullOrWhiteSpace(e), "You must enter your email address");
+        this.ValidationRule(vm => vm.EmailAddress,
+            e => string.IsNullOrWhiteSpace(e) || string.Equals(e, currentEmail, StringComparison.InvariantCultureIgnoreCase),
+            "The entered email address is not correct");
+    }
+
+    public ReactiveCommand<Unit, Unit> Submit { get; }
+
+    private async Task ExecuteSubmit(CancellationToken cts)
+    {
+        ApiResult result = await _userManagementService.RemoveAccount(cts);
+        if (result.IsSuccess)
+        {
+            await _windowService.ShowConfirmContentDialog("Account removed", "Hopefully we'll see you again!", cancel: null);
+            _authenticationService.Logout();
+        }
+        else
+            await _windowService.ShowConfirmContentDialog("Failed to remove account", result.Message ?? "An unexpected error occured", cancel: null);
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
index 166fcfe63..e83502417 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
@@ -26,6 +26,7 @@ public partial class SettingsViewModel : RoutableHostScreen<RoutableScreen>, IMa
             new("Plugins", "settings/plugins"),
             new("Devices", "settings/devices"),
             new("Releases", "settings/releases"),
+            new("Account", "settings/account"),
             new("About", "settings/about"),
         };
         
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
new file mode 100644
index 000000000..4339aaf79
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
@@ -0,0 +1,121 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
+             xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+             xmlns:loaders="clr-namespace:AsyncImageLoader.Loaders;assembly=AsyncImageLoader.Avalonia"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
+             x:Class="Artemis.UI.Screens.Settings.AccountTabView"
+             x:DataType="settings:AccountTabViewModel">
+    <Panel>
+        <StackPanel IsVisible="{CompiledBinding !IsLoggedIn^}" Margin="0 50 0 0">
+            <StackPanel.Styles>
+                <Styles>
+                    <Style Selector="TextBlock">
+                        <Setter Property="TextAlignment" Value="Center"></Setter>
+                        <Setter Property="TextWrapping" Value="Wrap"></Setter>
+                    </Style>
+                </Styles>
+            </StackPanel.Styles>
+            <TextBlock Theme="{StaticResource TitleTextBlockStyle}">You are not logged in</TextBlock>
+            <TextBlock>
+                <Run>In order to manage your account you must be logged in.</Run>
+                <LineBreak />
+                <Run>Creating an account is free and we'll not bother you with a newsletter or crap like that.</Run>
+            </TextBlock>
+
+            <Lottie Path="/Assets/Animations/login-pending.json" RepeatCount="1" Width="350" Height="350"></Lottie>
+
+            <TextBlock>
+                <Run>Click Log In below to (create an account) and log in.</Run>
+                <LineBreak />
+                <Run>You'll also be able to log in with Google or Discord.</Run>
+            </TextBlock>
+            <Button HorizontalAlignment="Center" Command="{CompiledBinding Login}" Margin="0 25 0 0">Login</Button>
+        </StackPanel>
+        
+        <ScrollViewer IsVisible="{CompiledBinding IsLoggedIn^}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+            <StackPanel>
+                <Grid RowDefinitions="*,*" ColumnDefinitions="Auto,*" VerticalAlignment="Top">
+                    <Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" CornerRadius="92" Width="92" Height="92" Margin="0 0 15 0" ClipToBounds="True">
+                        <asyncImageLoader:AdvancedImage Source="{CompiledBinding AvatarUrl}">
+                            <asyncImageLoader:AdvancedImage.Loader>
+                                <loaders:BaseWebImageLoader />
+                            </asyncImageLoader:AdvancedImage.Loader>
+                        </asyncImageLoader:AdvancedImage>
+                    </Border>
+                    <TextBlock Grid.Row="0" Grid.Column="1" Padding="0" VerticalAlignment="Bottom" Text="{CompiledBinding Name}" />
+                    <TextBlock Classes="subtitle" Grid.Column="1" Grid.Row="1" Padding="0" VerticalAlignment="Top" Text="{CompiledBinding Email}" />
+                </Grid>
+
+                <TextBlock Classes="card-title">
+                    Account management
+                </TextBlock>
+                <Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
+                    <StackPanel>
+                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                <TextBlock>
+                                    Change avatar
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                <Button Width="150" Content="Choose image" Command="{CompiledBinding ChangeAvatar}" />
+                            </StackPanel>
+                        </Grid>
+                        <Border Classes="card-separator" />
+
+                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                <TextBlock>
+                                    Email address
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                <Button Width="150" Content=" Change email" Command="{CompiledBinding ChangeEmailAddress}" />
+                            </StackPanel>
+                        </Grid>
+                        <Border Classes="card-separator" />
+
+                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                <TextBlock>
+                                    Password
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                <Button Width="150" Content="Change password" Command="{CompiledBinding ChangePasswordAddress}" />
+                            </StackPanel>
+                        </Grid>
+                        <Border Classes="card-separator" />
+
+                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                <TextBlock>
+                                    Remove account
+                                </TextBlock>
+                                <TextBlock Classes="subtitle">
+                                    Permanently remove your account, this cannot be undone
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                <Button Classes="danger" Width="150" Content="Remove account" Command="{CompiledBinding RemoveAccount}" />
+                            </StackPanel>
+                        </Grid>
+                    </StackPanel>
+                </Border>
+
+                <!-- <TextBlock Classes="card-title"> -->
+                <!--     Personal access tokens -->
+                <!-- </TextBlock> -->
+                <!-- <Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0"> -->
+                <!--     <StackPanel> -->
+                <!--         <TextBlock>TODO :)</TextBlock> -->
+                <!--     </StackPanel> -->
+                <!-- </Border> -->
+            </StackPanel>
+        </ScrollViewer>
+    </Panel>
+
+</UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs
new file mode 100644
index 000000000..040547f9f
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml.cs
@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.Settings;
+
+public partial class AccountTabView : ReactiveUserControl<AccountTabViewModel>
+{
+    public AccountTabView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
new file mode 100644
index 000000000..71f8b1a5f
--- /dev/null
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
@@ -0,0 +1,105 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.UI.Screens.Settings.Account;
+using Artemis.UI.Screens.Workshop.CurrentUser;
+using Artemis.UI.Shared.Routing;
+using Artemis.UI.Shared.Services;
+using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Services;
+using PropertyChanged.SourceGenerator;
+using ReactiveUI;
+
+namespace Artemis.UI.Screens.Settings;
+
+public partial class AccountTabViewModel : RoutableScreen
+{
+    private readonly IWindowService _windowService;
+    private readonly IAuthenticationService _authenticationService;
+    private readonly IUserManagementService _userManagementService;
+
+    [Notify(Setter.Private)] private string? _name;
+    [Notify(Setter.Private)] private string? _email;
+    [Notify(Setter.Private)] private string? _avatarUrl;
+
+    public AccountTabViewModel(IWindowService windowService, IAuthenticationService authenticationService, IUserManagementService userManagementService)
+    {
+        _windowService = windowService;
+        _authenticationService = authenticationService;
+        _userManagementService = userManagementService;
+        _authenticationService.AutoLogin(true);
+        
+        DisplayName = "Account";
+        IsLoggedIn = _authenticationService.IsLoggedIn;
+        
+        this.WhenActivated(d => _authenticationService.IsLoggedIn.Subscribe(_ => LoadCurrentUser()).DisposeWith(d));
+    }
+
+    public IObservable<bool> IsLoggedIn { get; }
+
+    public async Task Login()
+    {
+        await _windowService.CreateContentDialog().WithViewModel(out WorkshopLoginViewModel _).WithTitle("Account login").ShowAsync();
+    }
+    
+    public async Task ChangeAvatar()
+    {
+        string[]? result = await _windowService.CreateOpenFileDialog().HavingFilter(f => f.WithBitmaps()).ShowAsync();
+        if (result == null)
+            return;
+
+        try
+        {
+            AvatarUrl = $"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{Guid.Empty}";
+            await using FileStream fileStream = new(result.First(), FileMode.Open);
+            ApiResult changeResult = await _userManagementService.ChangeAvatar(fileStream, CancellationToken.None);
+            if (!changeResult.IsSuccess)
+                await _windowService.ShowConfirmContentDialog("Failed to change image", changeResult.Message ?? "An unexpected error occured", cancel: null);
+        }
+        finally
+        {
+            string? userId = _authenticationService.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
+            AvatarUrl = $"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{userId}";
+        }
+    }
+
+    public async Task ChangeEmailAddress()
+    {
+        await _windowService.CreateContentDialog().WithTitle("Change email address")
+            .WithViewModel(out ChangeEmailAddressViewModel vm)
+            .WithCloseButtonText("Cancel")
+            .HavingPrimaryButton(b => b.WithText("Submit").WithCommand(vm.Submit))
+            .ShowAsync();
+    }
+    
+    public async Task ChangePasswordAddress()
+    {
+        await _windowService.CreateContentDialog().WithTitle("Change password")
+            .WithViewModel(out ChangePasswordViewModel vm)
+            .WithCloseButtonText("Cancel")
+            .HavingPrimaryButton(b => b.WithText("Submit").WithCommand(vm.Submit))
+            .ShowAsync();
+    }
+    
+    public async Task RemoveAccount()
+    {
+        await _windowService.CreateContentDialog().WithTitle("Remove account")
+            .WithViewModel(out RemoveAccountViewModel vm)
+            .WithCloseButtonText("Cancel")
+            .HavingPrimaryButton(b => b.WithText("Permanently remove account").WithCommand(vm.Submit))
+            .ShowAsync();
+    }
+
+    private void LoadCurrentUser()
+    {
+        string? userId = _authenticationService.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
+        Name = _authenticationService.Claims.FirstOrDefault(c => c.Type == "name")?.Value;
+        Email = _authenticationService.Claims.FirstOrDefault(c => c.Type == "email")?.Value;
+        AvatarUrl = $"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{userId}";
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml
index 9692ebdc0..15127badd 100644
--- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml
@@ -34,8 +34,8 @@
                  Name="UserMenu">
             <Ellipse.ContextFlyout>
                 <Flyout>
-                    <Grid ColumnDefinitions="Auto,*" RowDefinitions="*,*,*" MinWidth="300">
-                        <Ellipse Grid.Column="0" Grid.RowSpan="3" Height="50" Width="50" Margin="0 0 8 0" VerticalAlignment="Top">
+                    <Grid ColumnDefinitions="Auto,*" RowDefinitions="*,*,*,*" MinWidth="300">
+                        <Ellipse Grid.Column="0" Grid.RowSpan="4" Height="50" Width="50" Margin="0 0 8 0" VerticalAlignment="Top">
                             <Ellipse.Fill>
                                 <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{CompiledBinding AvatarUrl}" />
                             </Ellipse.Fill>
@@ -46,10 +46,20 @@
                             IsVisible="{CompiledBinding AllowLogout}"
                             Grid.Column="1"
                             Grid.Row="2"
+                            Margin="-8 4 0 0"
+                            Padding="6 4"
+                            Click="Signout_OnClick">
+                            Sign out
+                        </controls:HyperlinkButton>
+                        
+                        <controls:HyperlinkButton
+                            IsVisible="{CompiledBinding AllowLogout}"
+                            Grid.Column="1"
+                            Grid.Row="3"
                             Margin="-8 0 0 0"
                             Padding="6 4"
-                            Click="Button_OnClick">
-                            Sign out
+                            Click="Manage_OnClick">
+                            Manage account
                         </controls:HyperlinkButton>
                     </Grid>
                 </Flyout>
diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs
index b690eb8dc..63fe16098 100644
--- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml.cs
@@ -13,9 +13,15 @@ public partial class CurrentUserView : ReactiveUserControl<CurrentUserViewModel>
         InitializeComponent();
     }
 
-    private void Button_OnClick(object? sender, RoutedEventArgs e)
+    private void Signout_OnClick(object? sender, RoutedEventArgs e)
     {
         UserMenu.ContextFlyout?.Hide();
         ViewModel?.Logout();
     }
+    
+    private void Manage_OnClick(object? sender, RoutedEventArgs e)
+    {
+        UserMenu.ContextFlyout?.Hide();
+        ViewModel?.ManageAccount();
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
index c6cbf3c8b..8a782486c 100644
--- a/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserViewModel.cs
@@ -6,6 +6,7 @@ using System.Reactive.Disposables;
 using System.Threading;
 using System.Threading.Tasks;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Services;
@@ -23,6 +24,7 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
     private readonly ObservableAsPropertyHelper<bool> _isAnonymous;
     private readonly ILogger _logger;
     private readonly IWindowService _windowService;
+    private readonly IRouter _router;
     [Notify] private bool _allowLogout = true;
     [Notify(Setter.Private)] private Bitmap? _avatar;
     [Notify(Setter.Private)] private string? _email;
@@ -31,11 +33,12 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
     [Notify(Setter.Private)] private string? _userId;
     [Notify(Setter.Private)] private string? _avatarUrl;
 
-    public CurrentUserViewModel(ILogger logger, IAuthenticationService authenticationService, IWindowService windowService)
+    public CurrentUserViewModel(ILogger logger, IAuthenticationService authenticationService, IWindowService windowService, IRouter router)
     {
         _logger = logger;
         _authenticationService = authenticationService;
         _windowService = windowService;
+        _router = router;
         Login = ReactiveCommand.CreateFromTask(ExecuteLogin);
 
         _isAnonymous = this.WhenAnyValue(vm => vm.Loading, vm => vm.Name, (l, n) => l || n == null).ToProperty(this, vm => vm.IsAnonymous);
@@ -92,4 +95,9 @@ public partial class CurrentUserViewModel : ActivatableViewModelBase
         Email = _authenticationService.Claims.FirstOrDefault(c => c.Type == "email")?.Value;
         AvatarUrl = $"{WorkshopConstants.AUTHORITY_URL}/user/avatar/{UserId}";
     }
+
+    public void ManageAccount()
+    {
+        _router.Navigate("settings/account");
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesViewModel.cs
index e771ee5d9..311164269 100644
--- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryReleasesViewModel.cs
@@ -8,6 +8,7 @@ using Artemis.UI.Shared.Services.Builders;
 using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 using Humanizer;
 using ReactiveUI;
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs
index 2028d514e..381d669b7 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/Dialogs/DeviceSelectionDialogViewModel.cs
@@ -7,6 +7,7 @@ using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.SurfaceEditor;
 using Artemis.UI.Shared;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Providers;
 using Artemis.WebClient.Workshop.Services;
 using ReactiveUI;
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
index 1edb014e3..1c12e2dbf 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
@@ -12,6 +12,7 @@ using Artemis.UI.Screens.Workshop.Parameters;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 using PropertyChanged.SourceGenerator;
 using StrawberryShake;
diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailViewModel.cs
index e617170f5..839511a5d 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionDetailViewModel.cs
@@ -213,7 +213,7 @@ public partial class SubmissionDetailViewModel : RoutableScreen<WorkshopDetailPa
         {
             using MemoryStream stream = new();
             EntrySpecificationsViewModel.IconBitmap.Save(stream);
-            ImageUploadResult imageResult = await _workshopService.SetEntryIcon(Entry.Id, stream, cancellationToken);
+            ApiResult imageResult = await _workshopService.SetEntryIcon(Entry.Id, stream, cancellationToken);
             if (!imageResult.IsSuccess)
                 throw new ArtemisWorkshopException("Failed to upload image. " + imageResult.Message);
         }
diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs
index 81b66bec2..ff52a640c 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabItemViewModel.cs
@@ -7,6 +7,7 @@ using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs
index bc5ba00f3..bec0203d8 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/InstalledTabViewModel.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Reactive;
 using System.Reactive.Linq;
 using Artemis.UI.Shared.Routing;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 using DynamicData;
 using DynamicData.Binding;
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
index 04eae8c0f..81e464311 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/UploadStepViewModel.cs
@@ -129,11 +129,11 @@ public partial class UploadStepViewModel : SubmissionViewModel
         return entryId;
     }
 
-    private async Task TryImageUpload(Func<Task<ImageUploadResult>> action)
+    private async Task TryImageUpload(Func<Task<ApiResult>> action)
     {
         try
         {
-            ImageUploadResult result = await action();
+            ApiResult result = await action();
             if (!result.IsSuccess)
                 throw new ArtemisWorkshopException(result.Message);
         }
diff --git a/src/Artemis.WebClient.Workshop/DryIoc/ContainerExtensions.cs b/src/Artemis.WebClient.Workshop/DryIoc/ContainerExtensions.cs
index 65449d45b..bebc8caf1 100644
--- a/src/Artemis.WebClient.Workshop/DryIoc/ContainerExtensions.cs
+++ b/src/Artemis.WebClient.Workshop/DryIoc/ContainerExtensions.cs
@@ -33,6 +33,11 @@ public static class ContainerExtensions
             .AddWorkshopClient()
             .AddHttpMessageHandler<WorkshopClientStoreAccessor, AuthenticationDelegatingHandler>()
             .ConfigureHttpClient(client => client.BaseAddress = new Uri(WorkshopConstants.WORKSHOP_URL + "/graphql"));
+        
+        serviceCollection.AddHttpClient(WorkshopConstants.IDENTITY_CLIENT_NAME)
+            .AddHttpMessageHandler<AuthenticationDelegatingHandler>()
+            .ConfigureHttpClient(client => client.BaseAddress = new Uri(WorkshopConstants.AUTHORITY_URL));
+        
         serviceCollection.AddHttpClient(WorkshopConstants.WORKSHOP_CLIENT_NAME)
             .AddHttpMessageHandler<AuthenticationDelegatingHandler>()
             .ConfigureHttpClient(client => client.BaseAddress = new Uri(WorkshopConstants.WORKSHOP_URL));
@@ -49,7 +54,8 @@ public static class ContainerExtensions
         container.Register<IAuthenticationService, AuthenticationService>(Reuse.Singleton);
         container.Register<IWorkshopService, WorkshopService>(Reuse.Singleton);
         container.Register<ILayoutProvider, WorkshopLayoutProvider>(Reuse.Singleton);
-        
+        container.Register<IUserManagementService, UserManagementService>();
+
         container.Register<EntryUploadHandlerFactory>(Reuse.Transient);
         container.RegisterMany(workshopAssembly, type => type.IsAssignableTo<IEntryUploadHandler>(), Reuse.Transient);
         container.RegisterMany(workshopAssembly, type => type.IsAssignableTo<IEntryInstallationHandler>(), Reuse.Transient);
diff --git a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs
index 482d34edb..53717506f 100644
--- a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs
+++ b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/EntryInstallResult.cs
@@ -1,4 +1,5 @@
-using Artemis.WebClient.Workshop.Services;
+using Artemis.WebClient.Workshop.Models;
+using Artemis.WebClient.Workshop.Services;
 
 namespace Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
 
diff --git a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/IEntryInstallationHandler.cs b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/IEntryInstallationHandler.cs
index 0e4e2d4f4..aacd0d580 100644
--- a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/IEntryInstallationHandler.cs
+++ b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/IEntryInstallationHandler.cs
@@ -1,4 +1,5 @@
 using Artemis.UI.Shared.Utilities;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 
 namespace Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
diff --git a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/LayoutEntryInstallationHandler.cs b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/LayoutEntryInstallationHandler.cs
index 370183824..aa755b8a0 100644
--- a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/LayoutEntryInstallationHandler.cs
+++ b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/LayoutEntryInstallationHandler.cs
@@ -4,6 +4,7 @@ using Artemis.Core.Providers;
 using Artemis.Core.Services;
 using Artemis.UI.Shared.Extensions;
 using Artemis.UI.Shared.Utilities;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Providers;
 using Artemis.WebClient.Workshop.Services;
 
diff --git a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/ProfileEntryInstallationHandler.cs b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/ProfileEntryInstallationHandler.cs
index 9abd616cf..78c31e98c 100644
--- a/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/ProfileEntryInstallationHandler.cs
+++ b/src/Artemis.WebClient.Workshop/Handlers/InstallationHandlers/Implementations/ProfileEntryInstallationHandler.cs
@@ -2,6 +2,7 @@
 using Artemis.Core.Services;
 using Artemis.UI.Shared.Extensions;
 using Artemis.UI.Shared.Utilities;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 
 namespace Artemis.WebClient.Workshop.Handlers.InstallationHandlers;
diff --git a/src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ImageUploadResult.cs b/src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ApiResult.cs
similarity index 51%
rename from src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ImageUploadResult.cs
rename to src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ApiResult.cs
index 7ebc08d2f..709357d2f 100644
--- a/src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ImageUploadResult.cs
+++ b/src/Artemis.WebClient.Workshop/Handlers/UploadHandlers/ApiResult.cs
@@ -1,21 +1,21 @@
 namespace Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 
-public class ImageUploadResult
+public class ApiResult
 {
     public bool IsSuccess { get; set; }
     public string? Message { get; set; }
 
-    public static ImageUploadResult FromFailure(string? message)
+    public static ApiResult FromFailure(string? message)
     {
-        return new ImageUploadResult
+        return new ApiResult
         {
             IsSuccess = false,
             Message = message
         };
     }
 
-    public static ImageUploadResult FromSuccess()
+    public static ApiResult FromSuccess()
     {
-        return new ImageUploadResult {IsSuccess = true};
+        return new ApiResult {IsSuccess = true};
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.WebClient.Workshop/Services/AccessToken.cs b/src/Artemis.WebClient.Workshop/Models/AccessToken.cs
similarity index 92%
rename from src/Artemis.WebClient.Workshop/Services/AccessToken.cs
rename to src/Artemis.WebClient.Workshop/Models/AccessToken.cs
index 7f4f7ba04..60e9f31d9 100644
--- a/src/Artemis.WebClient.Workshop/Services/AccessToken.cs
+++ b/src/Artemis.WebClient.Workshop/Models/AccessToken.cs
@@ -1,8 +1,7 @@
-using Artemis.Core;
 using Artemis.WebClient.Workshop.Exceptions;
 using IdentityModel.Client;
 
-namespace Artemis.WebClient.Workshop.Services;
+namespace Artemis.WebClient.Workshop.Models;
 
 internal class AuthenticationToken
 {
diff --git a/src/Artemis.WebClient.Workshop/Services/InstalledEntry.cs b/src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs
similarity index 99%
rename from src/Artemis.WebClient.Workshop/Services/InstalledEntry.cs
rename to src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs
index 6373a8d2a..5d961b4bf 100644
--- a/src/Artemis.WebClient.Workshop/Services/InstalledEntry.cs
+++ b/src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs
@@ -2,7 +2,7 @@
 using Artemis.Core;
 using Artemis.Storage.Entities.Workshop;
 
-namespace Artemis.WebClient.Workshop.Services;
+namespace Artemis.WebClient.Workshop.Models;
 
 public class InstalledEntry
 {
diff --git a/src/Artemis.WebClient.Workshop/Models/PersonalAccessToken.cs b/src/Artemis.WebClient.Workshop/Models/PersonalAccessToken.cs
new file mode 100644
index 000000000..61c8b46f2
--- /dev/null
+++ b/src/Artemis.WebClient.Workshop/Models/PersonalAccessToken.cs
@@ -0,0 +1,3 @@
+namespace Artemis.WebClient.Workshop.Models;
+
+public record PersonalAccessToken(string Key, DateTime CreationTime, DateTime? Expiration, string? Description);
\ No newline at end of file
diff --git a/src/Artemis.WebClient.Workshop/Providers/WorkshopLayoutProvider.cs b/src/Artemis.WebClient.Workshop/Providers/WorkshopLayoutProvider.cs
index 4d028f4a1..26fc0d5a0 100644
--- a/src/Artemis.WebClient.Workshop/Providers/WorkshopLayoutProvider.cs
+++ b/src/Artemis.WebClient.Workshop/Providers/WorkshopLayoutProvider.cs
@@ -1,5 +1,6 @@
 using Artemis.Core;
 using Artemis.Core.Providers;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 
 namespace Artemis.WebClient.Workshop.Providers;
diff --git a/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs b/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
index d3fd43ac6..3718f9242 100644
--- a/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
+++ b/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
@@ -8,6 +8,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Artemis.Core;
 using Artemis.WebClient.Workshop.Exceptions;
+using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Repositories;
 using DynamicData;
 using IdentityModel;
diff --git a/src/Artemis.WebClient.Workshop/Services/Interfaces/IUserManagementService.cs b/src/Artemis.WebClient.Workshop/Services/Interfaces/IUserManagementService.cs
new file mode 100644
index 000000000..1c6cbbde4
--- /dev/null
+++ b/src/Artemis.WebClient.Workshop/Services/Interfaces/IUserManagementService.cs
@@ -0,0 +1,16 @@
+using Artemis.Core.Services;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Models;
+
+namespace Artemis.WebClient.Workshop.Services;
+
+public interface IUserManagementService : IProtectedArtemisService
+{
+    Task<ApiResult> ChangePassword(string currentPassword, string newPassword, CancellationToken cancellationToken);
+    Task<ApiResult> ChangeEmailAddress(string emailAddress, CancellationToken cancellationToken);
+    Task<ApiResult> ChangeAvatar(Stream avatar, CancellationToken cancellationToken);
+    Task<ApiResult> RemoveAccount(CancellationToken cancellationToken);
+    Task<string> CreatePersonAccessToken(string description, DateTimeOffset expirationDate, CancellationToken cancellationToken);
+    Task<ApiResult> DeletePersonAccessToken(PersonalAccessToken personalAccessToken, CancellationToken cancellationToken);
+    Task<List<PersonalAccessToken>> GetPersonAccessTokens(CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/Artemis.WebClient.Workshop/Services/Interfaces/IWorkshopService.cs b/src/Artemis.WebClient.Workshop/Services/Interfaces/IWorkshopService.cs
index 976e37805..073db0414 100644
--- a/src/Artemis.WebClient.Workshop/Services/Interfaces/IWorkshopService.cs
+++ b/src/Artemis.WebClient.Workshop/Services/Interfaces/IWorkshopService.cs
@@ -1,12 +1,13 @@
 using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Models;
 
 namespace Artemis.WebClient.Workshop.Services;
 
 public interface IWorkshopService
 {
     Task<Stream?> GetEntryIcon(long entryId, CancellationToken cancellationToken);
-    Task<ImageUploadResult> SetEntryIcon(long entryId, Stream icon, CancellationToken cancellationToken);
-    Task<ImageUploadResult> UploadEntryImage(long entryId, ImageUploadRequest request, CancellationToken cancellationToken);
+    Task<ApiResult> SetEntryIcon(long entryId, Stream icon, CancellationToken cancellationToken);
+    Task<ApiResult> UploadEntryImage(long entryId, ImageUploadRequest request, CancellationToken cancellationToken);
     Task DeleteEntryImage(Guid id, CancellationToken cancellationToken);
     Task<WorkshopStatus> GetWorkshopStatus(CancellationToken cancellationToken);
     Task<bool> ValidateWorkshopStatus(CancellationToken cancellationToken);
diff --git a/src/Artemis.WebClient.Workshop/Services/UserManagementService.cs b/src/Artemis.WebClient.Workshop/Services/UserManagementService.cs
new file mode 100644
index 000000000..bbb0e443b
--- /dev/null
+++ b/src/Artemis.WebClient.Workshop/Services/UserManagementService.cs
@@ -0,0 +1,103 @@
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using Artemis.WebClient.Workshop.Exceptions;
+using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Models;
+
+namespace Artemis.WebClient.Workshop.Services;
+
+internal class UserManagementService : IUserManagementService
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+
+    public UserManagementService(IHttpClientFactory httpClientFactory)
+    {
+        _httpClientFactory = httpClientFactory;
+    }
+
+    /// <inheritdoc />
+    public async Task<ApiResult> ChangePassword(string currentPassword, string newPassword, CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.PostAsync("user/credentials", JsonContent.Create(new {CurrentPassword = currentPassword, NewPassword = newPassword}), cancellationToken);
+        return response.IsSuccessStatusCode 
+            ? ApiResult.FromSuccess() 
+            : ApiResult.FromFailure(await response.Content.ReadAsStringAsync(cancellationToken));
+    }
+
+    /// <inheritdoc />
+    public async Task<ApiResult> ChangeEmailAddress(string emailAddress, CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.PostAsync("user/email", JsonContent.Create(new {EmailAddress = emailAddress}), cancellationToken);
+        return response.IsSuccessStatusCode 
+            ? ApiResult.FromSuccess() 
+            : ApiResult.FromFailure(await response.Content.ReadAsStringAsync(cancellationToken));
+    }
+
+    public async Task<ApiResult> ChangeAvatar(Stream avatar, CancellationToken cancellationToken)
+    {
+        avatar.Seek(0, SeekOrigin.Begin);
+
+        // Submit the archive
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+
+        // Construct the request
+        MultipartFormDataContent content = new();
+        StreamContent streamContent = new(avatar);
+        streamContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+        content.Add(streamContent, "file", "file.png");
+
+        // Submit
+        HttpResponseMessage response = await client.PutAsync($"user/avatar", content, cancellationToken);
+        return response.IsSuccessStatusCode 
+            ? ApiResult.FromSuccess() 
+            : ApiResult.FromFailure(await response.Content.ReadAsStringAsync(cancellationToken));
+    }
+
+    /// <inheritdoc />
+    public async Task<ApiResult> RemoveAccount(CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.DeleteAsync("user", cancellationToken);
+        return response.IsSuccessStatusCode 
+            ? ApiResult.FromSuccess() 
+            : ApiResult.FromFailure(await response.Content.ReadAsStringAsync(cancellationToken));
+    }
+
+    /// <inheritdoc />
+    public async Task<string> CreatePersonAccessToken(string description, DateTimeOffset expirationDate, CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.PostAsync("user/access-token", JsonContent.Create(new {Description = description, ExpirationDate = expirationDate}), cancellationToken);
+        response.EnsureSuccessStatusCode();
+        
+        string? result = await response.Content.ReadFromJsonAsync<string>(cancellationToken: cancellationToken);
+        if (result == null)
+            throw new ArtemisWebClientException("Failed to deserialize access token");
+        return result;
+    }
+
+    /// <inheritdoc />
+    public async Task<ApiResult> DeletePersonAccessToken(PersonalAccessToken personalAccessToken, CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.DeleteAsync($"user/access-token/{personalAccessToken.Key}", cancellationToken);
+        return response.IsSuccessStatusCode 
+            ? ApiResult.FromSuccess() 
+            : ApiResult.FromFailure(await response.Content.ReadAsStringAsync(cancellationToken));
+    }
+
+    /// <inheritdoc />
+    public async Task<List<PersonalAccessToken>> GetPersonAccessTokens(CancellationToken cancellationToken)
+    {
+        HttpClient client = _httpClientFactory.CreateClient(WorkshopConstants.IDENTITY_CLIENT_NAME);
+        HttpResponseMessage response = await client.GetAsync("user/access-token", cancellationToken);
+        response.EnsureSuccessStatusCode();
+        
+        List<PersonalAccessToken>? result = await response.Content.ReadFromJsonAsync<List<PersonalAccessToken>>(cancellationToken: cancellationToken);
+        if (result == null)
+            throw new ArtemisWebClientException("Failed to deserialize access tokens");
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs b/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs
index 236a5f6e4..a1b1bf21d 100644
--- a/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs
+++ b/src/Artemis.WebClient.Workshop/Services/WorkshopService.cs
@@ -2,8 +2,8 @@ using System.Net.Http.Headers;
 using Artemis.Storage.Entities.Workshop;
 using Artemis.Storage.Repositories.Interfaces;
 using Artemis.UI.Shared.Routing;
-using Artemis.UI.Shared.Utilities;
 using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
+using Artemis.WebClient.Workshop.Models;
 
 namespace Artemis.WebClient.Workshop.Services;
 
@@ -36,7 +36,7 @@ public class WorkshopService : IWorkshopService
         }
     }
 
-    public async Task<ImageUploadResult> SetEntryIcon(long entryId, Stream icon, CancellationToken cancellationToken)
+    public async Task<ApiResult> SetEntryIcon(long entryId, Stream icon, CancellationToken cancellationToken)
     {
         icon.Seek(0, SeekOrigin.Begin);
 
@@ -52,12 +52,12 @@ public class WorkshopService : IWorkshopService
         // Submit
         HttpResponseMessage response = await client.PostAsync($"entries/{entryId}/icon", content, cancellationToken);
         if (!response.IsSuccessStatusCode)
-            return ImageUploadResult.FromFailure($"{response.StatusCode} - {await response.Content.ReadAsStringAsync(cancellationToken)}");
-        return ImageUploadResult.FromSuccess();
+            return ApiResult.FromFailure($"{response.StatusCode} - {await response.Content.ReadAsStringAsync(cancellationToken)}");
+        return ApiResult.FromSuccess();
     }
 
     /// <inheritdoc />
-    public async Task<ImageUploadResult> UploadEntryImage(long entryId, ImageUploadRequest request, CancellationToken cancellationToken)
+    public async Task<ApiResult> UploadEntryImage(long entryId, ImageUploadRequest request, CancellationToken cancellationToken)
     {
         request.File.Seek(0, SeekOrigin.Begin);
 
@@ -76,8 +76,8 @@ public class WorkshopService : IWorkshopService
         // Submit
         HttpResponseMessage response = await client.PostAsync($"entries/{entryId}/image", content, cancellationToken);
         if (!response.IsSuccessStatusCode)
-            return ImageUploadResult.FromFailure($"{response.StatusCode} - {await response.Content.ReadAsStringAsync(cancellationToken)}");
-        return ImageUploadResult.FromSuccess();
+            return ApiResult.FromFailure($"{response.StatusCode} - {await response.Content.ReadAsStringAsync(cancellationToken)}");
+        return ApiResult.FromSuccess();
     }
 
     /// <inheritdoc />
diff --git a/src/Artemis.WebClient.Workshop/WorkshopConstants.cs b/src/Artemis.WebClient.Workshop/WorkshopConstants.cs
index ced548d1f..10807064c 100644
--- a/src/Artemis.WebClient.Workshop/WorkshopConstants.cs
+++ b/src/Artemis.WebClient.Workshop/WorkshopConstants.cs
@@ -6,5 +6,6 @@ public static class WorkshopConstants
     // public const string WORKSHOP_URL = "https://localhost:7281";
     public const string AUTHORITY_URL = "https://identity.artemis-rgb.com";
     public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com";
+    public const string IDENTITY_CLIENT_NAME = "IdentityApiClient";
     public const string WORKSHOP_CLIENT_NAME = "WorkshopApiClient";
 }
\ No newline at end of file

From 38a1318170e5e5d875ed4899b67e0e26f80cc595 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Tue, 13 Feb 2024 21:55:09 +0100
Subject: [PATCH 3/3] Account management - Final tweaks

---
 src/Artemis.Core/Models/Profile/Layer.cs      | 14 ++++--
 .../Settings/Tabs/AccountTabView.axaml        | 49 ++++++++-----------
 .../Settings/Tabs/AccountTabViewModel.cs      |  9 ++++
 .../Services/AuthenticationService.cs         |  2 +-
 4 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs
index 85683eb49..58c13265f 100644
--- a/src/Artemis.Core/Models/Profile/Layer.cs
+++ b/src/Artemis.Core/Models/Profile/Layer.cs
@@ -18,7 +18,7 @@ public sealed class Layer : RenderProfileElement
 {
     private const string BROKEN_STATE_BRUSH_NOT_FOUND = "Failed to load layer brush, ensure the plugin is enabled";
     private const string BROKEN_STATE_INIT_FAILED = "Failed to initialize layer brush";
-    
+
     private readonly List<Layer> _renderCopies = new();
     private LayerGeneralProperties _general = new();
     private LayerTransformProperties _transform = new();
@@ -735,6 +735,9 @@ public sealed class Layer : RenderProfileElement
         if (Disposed)
             throw new ObjectDisposedException("Layer");
 
+        if (_leds.Contains(led))
+            return;
+
         _leds.Add(led);
         CalculateRenderProperties();
     }
@@ -761,7 +764,9 @@ public sealed class Layer : RenderProfileElement
         if (Disposed)
             throw new ObjectDisposedException("Layer");
 
-        _leds.Remove(led);
+        if (!_leds.Remove(led))
+            return;
+        
         CalculateRenderProperties();
     }
 
@@ -773,6 +778,9 @@ public sealed class Layer : RenderProfileElement
         if (Disposed)
             throw new ObjectDisposedException("Layer");
 
+        if (!_leds.Any())
+            return;
+
         _leds.Clear();
         CalculateRenderProperties();
     }
@@ -790,7 +798,7 @@ public sealed class Layer : RenderProfileElement
         {
             ArtemisLed? match = availableLeds.FirstOrDefault(a => a.Device.Identifier == ledEntity.DeviceIdentifier &&
                                                                   a.RgbLed.Id.ToString() == ledEntity.LedName);
-            if (match != null)
+            if (match != null && !leds.Contains(match))
                 leds.Add(match);
             else
                 _missingLeds.Add(ledEntity);
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
index 4339aaf79..c27ce59bc 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabView.axaml
@@ -5,6 +5,7 @@
              xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
              xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              xmlns:loaders="clr-namespace:AsyncImageLoader.Loaders;assembly=AsyncImageLoader.Avalonia"
+             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
              x:Class="Artemis.UI.Screens.Settings.AccountTabView"
              x:DataType="settings:AccountTabViewModel">
@@ -34,9 +35,9 @@
             </TextBlock>
             <Button HorizontalAlignment="Center" Command="{CompiledBinding Login}" Margin="0 25 0 0">Login</Button>
         </StackPanel>
-        
+
         <ScrollViewer IsVisible="{CompiledBinding IsLoggedIn^}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-            <StackPanel>
+            <StackPanel Margin="15" MaxWidth="1000">
                 <Grid RowDefinitions="*,*" ColumnDefinitions="Auto,*" VerticalAlignment="Top">
                     <Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" CornerRadius="92" Width="92" Height="92" Margin="0 0 15 0" ClipToBounds="True">
                         <asyncImageLoader:AdvancedImage Source="{CompiledBinding AvatarUrl}">
@@ -45,7 +46,7 @@
                             </asyncImageLoader:AdvancedImage.Loader>
                         </asyncImageLoader:AdvancedImage>
                     </Border>
-                    <TextBlock Grid.Row="0" Grid.Column="1" Padding="0" VerticalAlignment="Bottom" Text="{CompiledBinding Name}" />
+                    <TextBlock Grid.Row="0" Grid.Column="1" Padding="0" VerticalAlignment="Bottom" Text="{CompiledBinding Name}" Classes="h3 no-margin"/>
                     <TextBlock Classes="subtitle" Grid.Column="1" Grid.Row="1" Padding="0" VerticalAlignment="Top" Text="{CompiledBinding Email}" />
                 </Grid>
 
@@ -54,11 +55,27 @@
                 </TextBlock>
                 <Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
                     <StackPanel>
+                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto" IsVisible="{CompiledBinding CanChangePassword}">
+                            <StackPanel Grid.Column="0" VerticalAlignment="Top">
+                                <TextBlock>
+                                    Credentials
+                                </TextBlock>
+                            </StackPanel>
+                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Spacing="10">
+                                <Button Width="150" Content="Change email" Command="{CompiledBinding ChangeEmailAddress}" />
+                                <Button Width="150" Content="Change password" Command="{CompiledBinding ChangePasswordAddress}" />
+                            </StackPanel>
+                        </Grid>
+                        <Border Classes="card-separator"  IsVisible="{CompiledBinding CanChangePassword}"/>
+                        
                         <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
                             <StackPanel Grid.Column="0" VerticalAlignment="Center">
                                 <TextBlock>
                                     Change avatar
                                 </TextBlock>
+                                <TextBlock Classes="subtitle">
+                                    Quite pointless currently, but in the future your avatar will be visible in the workshop.
+                                </TextBlock>
                             </StackPanel>
                             <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
                                 <Button Width="150" Content="Choose image" Command="{CompiledBinding ChangeAvatar}" />
@@ -66,37 +83,13 @@
                         </Grid>
                         <Border Classes="card-separator" />
 
-                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                <TextBlock>
-                                    Email address
-                                </TextBlock>
-                            </StackPanel>
-                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                <Button Width="150" Content=" Change email" Command="{CompiledBinding ChangeEmailAddress}" />
-                            </StackPanel>
-                        </Grid>
-                        <Border Classes="card-separator" />
-
-                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
-                            <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                <TextBlock>
-                                    Password
-                                </TextBlock>
-                            </StackPanel>
-                            <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
-                                <Button Width="150" Content="Change password" Command="{CompiledBinding ChangePasswordAddress}" />
-                            </StackPanel>
-                        </Grid>
-                        <Border Classes="card-separator" />
-
                         <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
                             <StackPanel Grid.Column="0" VerticalAlignment="Center">
                                 <TextBlock>
                                     Remove account
                                 </TextBlock>
                                 <TextBlock Classes="subtitle">
-                                    Permanently remove your account, this cannot be undone
+                                    Permanently remove your account, this cannot be undone.
                                 </TextBlock>
                             </StackPanel>
                             <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
index 71f8b1a5f..0e361deb3 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Tabs/AccountTabViewModel.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Artemis.UI.Screens.Settings.Account;
@@ -12,6 +13,7 @@ using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
 using Artemis.WebClient.Workshop.Handlers.UploadHandlers;
 using Artemis.WebClient.Workshop.Services;
+using IdentityModel;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
@@ -22,6 +24,7 @@ public partial class AccountTabViewModel : RoutableScreen
     private readonly IWindowService _windowService;
     private readonly IAuthenticationService _authenticationService;
     private readonly IUserManagementService _userManagementService;
+    private ObservableAsPropertyHelper<bool>? _canChangePassword;
 
     [Notify(Setter.Private)] private string? _name;
     [Notify(Setter.Private)] private string? _email;
@@ -37,9 +40,15 @@ public partial class AccountTabViewModel : RoutableScreen
         DisplayName = "Account";
         IsLoggedIn = _authenticationService.IsLoggedIn;
         
+        this.WhenActivated(d =>
+        {
+            _canChangePassword = _authenticationService.GetClaim(JwtClaimTypes.AuthenticationMethod).Select(c => c?.Value == "pwd").ToProperty(this, vm => vm.CanChangePassword);
+            _canChangePassword.DisposeWith(d);
+        });
         this.WhenActivated(d => _authenticationService.IsLoggedIn.Subscribe(_ => LoadCurrentUser()).DisposeWith(d));
     }
 
+    public bool CanChangePassword => _canChangePassword?.Value ?? false;
     public IObservable<bool> IsLoggedIn { get; }
 
     public async Task Login()
diff --git a/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs b/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
index 3718f9242..80a7bb470 100644
--- a/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
+++ b/src/Artemis.WebClient.Workshop/Services/AuthenticationService.cs
@@ -123,7 +123,7 @@ internal class AuthenticationService : CorePropertyChanged, IAuthenticationServi
     public IObservable<Claim?> GetClaim(string type)
     {
         return _claims.Connect()
-            .Filter(c => c.Type == JwtClaimTypes.Email)
+            .Filter(c => c.Type == type)
             .ToCollection()
             .Select(f => f.FirstOrDefault());
     }