diff --git a/Components/Layout/NavMenu.razor b/Components/Layout/NavMenu.razor
index 1ff2cb7..ef15087 100644
--- a/Components/Layout/NavMenu.razor
+++ b/Components/Layout/NavMenu.razor
@@ -1,25 +1,29 @@
-<MudNavMenu>
-    <MudText Typo="Typo.h6" Class="px-4 mt-4 mb-2">Navigation</MudText>
-    <MudDivider Class="mb-2" />
-    <MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.CalendarMonth">Wochenübersicht</MudNavLink>
-    <MudNavLink Href="month" Icon="@Icons.Material.Filled.CalendarViewMonth">Monatsübersicht</MudNavLink>
-    <MudNavLink Href="feiertage" Icon="@Icons.Material.Filled.Celebration">Feiertage</MudNavLink>
-    <MudNavLink Href="urlaub-maximizer" Icon="@Icons.Material.Filled.AutoAwesome">Urlaubs-Maximizer</MudNavLink>
-    <MudNavLink Href="settings" Icon="@Icons.Material.Filled.Settings">Einstellungen</MudNavLink>
-    <MudDivider Class="mt-2 mb-2" />
-    <AuthorizeView Policy="AdminOnly">
-        <MudNavLink Href="admin/users" Icon="@Icons.Material.Filled.AdminPanelSettings" IconColor="Color.Error">
-            Benutzerverwaltung
-        </MudNavLink>
-    </AuthorizeView>
+<div style="display:flex; flex-direction:column; height:100%;">
+    <MudNavMenu Style="flex:1">
+        <MudDivider Class="mb-2" />
+        <MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.CalendarMonth">Wochenübersicht</MudNavLink>
+        <MudNavLink Href="month" Icon="@Icons.Material.Filled.CalendarViewMonth">Monatsübersicht</MudNavLink>
+        <MudNavLink Href="feiertage" Icon="@Icons.Material.Filled.Celebration">Feiertage</MudNavLink>
+        <MudNavLink Href="urlaub-maximizer" Icon="@Icons.Material.Filled.AutoAwesome">Urlaubs-Maximizer</MudNavLink>
+        <MudNavLink Href="settings" Icon="@Icons.Material.Filled.Settings">Einstellungen</MudNavLink>
+        <MudDivider Class="mt-2 mb-2" />
+        <AuthorizeView Policy="AdminOnly">
+            <MudNavLink Href="admin/users" Icon="@Icons.Material.Filled.AdminPanelSettings" IconColor="Color.Error">
+                Benutzerverwaltung
+            </MudNavLink>
+        </AuthorizeView>
+    </MudNavMenu>
     <AuthorizeView>
         <Authorized>
-            <MudStack Row="true" AlignItems="AlignItems.Center" Class="px-4 py-1" Spacing="1">
+            <MudDivider />
+            <MudStack Row="true" AlignItems="AlignItems.Center" Class="px-4 py-2" Spacing="1">
                 <MudIcon Icon="@Icons.Material.Filled.AccountCircle" Color="Color.Primary" Size="Size.Small" />
                 <MudText Typo="Typo.body2" Style="font-weight:600">@context.User.Identity?.Name</MudText>
             </MudStack>
-            <MudNavLink Href="/auth/logout" Icon="@Icons.Material.Filled.Logout">Abmelden</MudNavLink>
+            <MudNavMenu>
+                <MudNavLink Href="/auth/logout" Icon="@Icons.Material.Filled.Logout">Abmelden</MudNavLink>
+            </MudNavMenu>
         </Authorized>
     </AuthorizeView>
-</MudNavMenu>
-
+    <MudText Typo="Typo.caption" Class="px-4 py-2" Style="color: var(--mud-palette-text-disabled); text-align:center;">Version 1.1</MudText>
+</div>
\ No newline at end of file
diff --git a/Components/Pages/AdminUsers.razor b/Components/Pages/AdminUsers.razor
index ce35754..3c48166 100644
--- a/Components/Pages/AdminUsers.razor
+++ b/Components/Pages/AdminUsers.razor
@@ -47,26 +47,56 @@ else
                             <MudText Typo="Typo.body2" Color="Color.Secondary">@context.Id</MudText>
                         </MudTd>
                         <MudTd>
-                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                                <MudIcon Icon="@Icons.Material.Filled.AccountCircle"
-                                         Color="@(context.Username == "marc" ? Color.Error : Color.Default)"
-                                         Size="Size.Small" />
-                                <MudText Style="@(context.Username == "marc" ? "font-weight:700" : "")">
-                                    @context.Username
-                                </MudText>
-                                @if (context.Username == "marc")
-                                {
-                                    <MudChip T="string" Size="Size.Small" Color="Color.Error" Variant="Variant.Outlined">Admin</MudChip>
-                                }
-                            </MudStack>
+                            @if (_editUserId == context.Id)
+                            {
+                                <MudTextField @bind-Value="_editUsername"
+                                              Variant="Variant.Outlined"
+                                              Margin="Margin.Dense"
+                                              Immediate="true"
+                                              Style="max-width:220px"
+                                              OnKeyDown="@(async e => { if (e.Key == "Enter") await SaveRename(context); })" />
+                            }
+                            else
+                            {
+                                <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                                    <MudIcon Icon="@Icons.Material.Filled.AccountCircle"
+                                             Color="@(context.Username == "marc" ? Color.Error : Color.Default)"
+                                             Size="Size.Small" />
+                                    <MudText Style="@(context.Username == "marc" ? "font-weight:700" : "")">
+                                        @context.Username
+                                    </MudText>
+                                    @if (context.Username == "marc")
+                                    {
+                                        <MudChip T="string" Size="Size.Small" Color="Color.Error" Variant="Variant.Outlined">Admin</MudChip>
+                                    }
+                                </MudStack>
+                            }
                         </MudTd>
                         <MudTd Style="text-align:right">
-                            @if (context.Username != "marc")
+                            @if (_editUserId == context.Id)
                             {
-                                <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline"
-                                               Color="Color.Error"
+                                <MudIconButton Icon="@Icons.Material.Filled.Check"
+                                               Color="Color.Success"
                                                Size="Size.Small"
-                                               OnClick="@(() => DeleteUser(context))" />
+                                               OnClick="@(() => SaveRename(context))" />
+                                <MudIconButton Icon="@Icons.Material.Filled.Close"
+                                               Color="Color.Default"
+                                               Size="Size.Small"
+                                               OnClick="CancelEdit" />
+                            }
+                            else
+                            {
+                                <MudIconButton Icon="@Icons.Material.Filled.Edit"
+                                               Color="Color.Primary"
+                                               Size="Size.Small"
+                                               OnClick="@(() => StartEdit(context))" />
+                                @if (context.Username != "marc")
+                                {
+                                    <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline"
+                                                   Color="Color.Error"
+                                                   Size="Size.Small"
+                                                   OnClick="@(() => DeleteUser(context))" />
+                                }
                             }
                         </MudTd>
                     </RowTemplate>
@@ -83,6 +113,8 @@ else
 @code {
     private List<User> _users = [];
     private bool _loading = true;
+    private int? _editUserId;
+    private string _editUsername = "";
 
     protected override async Task OnInitializedAsync()
     {
@@ -94,6 +126,33 @@ else
         _loading = false;
     }
 
+    private void StartEdit(User user)
+    {
+        _editUserId = user.Id;
+        _editUsername = user.Username;
+    }
+
+    private void CancelEdit()
+    {
+        _editUserId = null;
+        _editUsername = "";
+    }
+
+    private async Task SaveRename(User user)
+    {
+        var trimmed = _editUsername.Trim();
+        var error = await AuthService.RenameUserAsync(user.Id, trimmed);
+        if (error != null)
+        {
+            Snackbar.Add(error, Severity.Error);
+            return;
+        }
+        user.Username = trimmed;
+        _editUserId = null;
+        _editUsername = "";
+        Snackbar.Add($"Benutzer umbenannt zu \"{trimmed}\".", Severity.Success);
+    }
+
     private async Task DeleteUser(User user)
     {
         await AuthService.DeleteUserAsync(user.Id);
diff --git a/Data/AuthService.cs b/Data/AuthService.cs
index 7e3753b..67b94ed 100644
--- a/Data/AuthService.cs
+++ b/Data/AuthService.cs
@@ -34,6 +34,23 @@ public class AuthService(IDbContextFactory<TimetrackerDbContext> factory)
         }
     }
 
+    public async Task<string?> RenameUserAsync(int userId, string newUsername)
+    {
+        if (string.IsNullOrWhiteSpace(newUsername) || newUsername.Length < 3)
+            return "Benutzername muss mindestens 3 Zeichen lang sein.";
+
+        await using var db = await factory.CreateDbContextAsync();
+        if (await db.Users.AnyAsync(u => u.Username == newUsername && u.Id != userId))
+            return "Benutzername bereits vergeben.";
+
+        var user = await db.Users.FindAsync(userId);
+        if (user == null) return "Benutzer nicht gefunden.";
+
+        user.Username = newUsername;
+        await db.SaveChangesAsync();
+        return null;
+    }
+
     public async Task<(User? User, string? Error)> RegisterAsync(string username, string password)    {
         if (string.IsNullOrWhiteSpace(username) || username.Length < 3)
             return (null, "Benutzername muss mindestens 3 Zeichen lang sein.");
diff --git a/timetracker.db b/timetracker.db
index f6a6ce5..de90888 100644
Binary files a/timetracker.db and b/timetracker.db differ