diff --git a/Lieb/Data/UserService.cs b/Lieb/Data/UserService.cs
index 7bdebba..7020dec 100644
--- a/Lieb/Data/UserService.cs
+++ b/Lieb/Data/UserService.cs
@@ -95,16 +95,7 @@ namespace Lieb.Data
         public async Task EditUser(LiebUser user)
         {
             using var context = _contextFactory.CreateDbContext();
-            LiebUser? userToChange = context.LiebUsers
-            .Include(u => u.GuildWars2Accounts)
-            .FirstOrDefault(u => u.Id == user.Id);
-
-            if(userToChange != null)
-            {
-                userToChange.Name = user.Name;
-                userToChange.Pronouns = user.Pronouns;
-                userToChange.Birthday = user.Birthday;
-            }
+            context.Update(user);
             await context.SaveChangesAsync();
             await _discordService.RenameUser(user.Id, user.Name, GetMainAccount(user.Id).AccountName);
         }
diff --git a/Lieb/Pages/User/ManageAccount.razor b/Lieb/Pages/User/ManageAccount.razor
index af0e2ae..8a3fe4d 100644
--- a/Lieb/Pages/User/ManageAccount.razor
+++ b/Lieb/Pages/User/ManageAccount.razor
@@ -35,27 +35,40 @@
                 <InputDate @bind-Value="_user.Birthday" />
             </label>
         </p>
-        
+    
+        <br />
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="gw2accountedit">
+                <span class="oi oi-plus" aria-hidden="true"></span> Add Guild Wars 2 Account
+            </NavLink>
+        </div>
+        <table>
+            <tr>
+                <th>Main Account</th>
+                <th>Edit</th>
+            </tr>
+            <InputRadioGroup @bind-Value="_user.MainGW2Account">
+                @foreach(GuildWars2Account account in _user.GuildWars2Accounts)
+                {
+                    <tr>
+                        <td>
+                        <InputRadio Value="@account.GuildWars2AccountId" /> @account.AccountName 
+                        </td>
+                        <td>
+                        <div class="nav-item px-3">
+                            @{string navLink = $"gw2accountedit/{@account.GuildWars2AccountId}";}
+                            <NavLink class="nav-link" href="@navLink">Edit</NavLink>
+                        </div>
+                        </td>
+                    </tr>
+                }
+            </InputRadioGroup>
+        </table>
+            
         <br />
         <button type="submit">Save</button>
         <ValidationSummary />
-
     </EditForm>
-    
-    <br />
-    <div class="nav-item px-3">
-        <NavLink class="nav-link" href="gw2accountedit">
-            <span class="oi oi-plus" aria-hidden="true"></span> Add Guild Wars 2 Account
-        </NavLink>
-    </div>
-
-    @foreach(GuildWars2Account account in _user.GuildWars2Accounts)
-    {
-        <div class="nav-item px-3">
-            @{string navLink = $"gw2accountedit/{@account.GuildWars2AccountId}";}
-            <NavLink class="nav-link" href="@navLink">@account.AccountName</NavLink>
-        </div>
-    }
 </Authorized>
 </AuthorizeView>
 
@@ -73,6 +86,10 @@
         _user = UserService.GetLiebUserGW2AccountOnly(discordId);
     }
 
+    async Task Changed(int buildId, ChangeEventArgs args)
+    {
+        bool canTank = bool.Parse(args.Value.ToString());
+    }
 
     private async Task HandleValidSubmit()
     {