diff --git a/README.md b/README.md
index 1366239..26ad808 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ A simple backend management api for ASP.NET Core Web APIs
 - [x] Code cleanup
 - [x] Relations in database
 - [x] Generated Admin pages
-- [ ] Pretty Login page for administration
+- [x] Pretty Login page for administration
 - [ ] Clean documentation
 
 # Usage
diff --git a/src/HopFrame.Web/Pages/Administration/AdminDashboard.razor b/src/HopFrame.Web/Pages/Administration/AdminDashboard.razor
index 9484d82..71d3482 100644
--- a/src/HopFrame.Web/Pages/Administration/AdminDashboard.razor
+++ b/src/HopFrame.Web/Pages/Administration/AdminDashboard.razor
@@ -17,7 +17,7 @@
         @foreach (var adminPage in Pages.LoadRegisteredAdminPages()) {
             <AuthorizedView Permission="@adminPage.Permissions.View">
                 <BSCol Column="4" style="margin-bottom: 10px">
-                    <BSCard CardType="CardType.Card" Color="BSColor.Dark" style="min-height: 200px">
+                    <BSCard CardType="CardType.Card" Color="BSColor.Dark" style="min-height: 200px; min-width: 200px">
                         <BSCard CardType="CardType.Body" style="display: flex; flex-direction: column">
                             <BSCard CardType="CardType.Title">@adminPage.Title</BSCard>
                             <BSCard CardType="CardType.Subtitle"><span style="color: gray">@adminPage.Permissions.View</span></BSCard>
diff --git a/src/HopFrame.Web/Pages/Administration/AdminLogin.razor b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor
index 1033852..1d9a61e 100644
--- a/src/HopFrame.Web/Pages/Administration/AdminLogin.razor
+++ b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor
@@ -12,29 +12,10 @@
 <PageTitle>Login</PageTitle>
 
 <div class="login-wrapper">
-    @*<EditForm Model="UserLogin" OnValidSubmit="Login" FormName="login-form">
-        <div class="field-wrapper">
-            <h3>Login</h3>
-            <div class="mb-3">
-                <BSLabel>E-Mail address</BSLabel>
-                <InputText type="email" class="form-control" required @bind-Value="UserLogin.Email"/>
-            </div>
-            <div class="mb-3">
-                <BSLabel>Password</BSLabel>
-                <InputText type="password" class="form-control" required @bind-Value="UserLogin.Password"/>
-            </div>
-            <BSButton Color="BSColor.Primary" IsSubmit="true">Login</BSButton>
-
-            @if (_hasError) {
-                <BSAlert Color="BSColor.Danger" style="margin-top: 16px; margin-bottom: 0">Email or password does not match any account!</BSAlert>
-            }
-        </div>
-    </EditForm>*@
-    
     <div id="login-card">
         <span id="login-title">HopFrame Administration</span>
         <span id="login-subtitle">Login to proceed</span>
-        <EditForm Model="UserLogin" OnInvalidSubmit="Login" FormName="login-form" style="display: flex; flex-grow: 1; flex-direction: column">
+        <EditForm Model="UserLogin" OnValidSubmit="Login" FormName="login-form" style="display: flex; flex-grow: 1; flex-direction: column">
             <div class="mb-3">
                 <BSLabel>E-Mail address</BSLabel>
                 <InputText type="email" class="form-control" required @bind-Value="UserLogin.Email"/>
@@ -76,7 +57,7 @@
         }
     }
 
-    private async Task Login() { //TODO: Login does not work
+    private async Task Login() {
         var result = await Auth.Login(UserLogin);
 
         if (!result) {
@@ -84,6 +65,6 @@
             return;
         }
 
-        Navigator.NavigateTo(string.IsNullOrEmpty(RedirectAfter) ? DefaultRedirect : RedirectAfter, true);
+        Navigator.NavigateTo(string.IsNullOrEmpty(RedirectAfter) ? DefaultRedirect : "/administration/" + RedirectAfter, true);
     }
 }
\ No newline at end of file
diff --git a/src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css
index ae5dfed..ef25346 100644
--- a/src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css
+++ b/src/HopFrame.Web/Pages/Administration/AdminLogin.razor.css
@@ -29,6 +29,6 @@
 
 #login-subtitle {
     font-size: 24px;
-    opacity: .3;
+    color: gray;
     margin-bottom: 30px;
 }
diff --git a/src/HopFrame.Web/Pages/Administration/AdminPageList.razor b/src/HopFrame.Web/Pages/Administration/AdminPageList.razor
index c794eaf..cba8f4f 100644
--- a/src/HopFrame.Web/Pages/Administration/AdminPageList.razor
+++ b/src/HopFrame.Web/Pages/Administration/AdminPageList.razor
@@ -18,7 +18,7 @@
 @using HopFrame.Web.Components
 
 <PageTitle>@_pageData.Title</PageTitle>
-<AuthorizedView Permission="@_pageData.Permissions.View" RedirectIfUnauthorized="administration/login" />
+<AuthorizedView Permission="@_pageData.Permissions.View" RedirectIfUnauthorized="@GenerateRedirectString()" />
 
 <AdminPageModal ReloadDelegate="Reload" @ref="_modal"/>
 
@@ -243,4 +243,8 @@
             });
         }
     }
+
+    private string GenerateRedirectString() {
+        return "/administration/login?redirect=" + _pageData?.Url;
+    }
 }
\ No newline at end of file
diff --git a/src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor b/src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor
index 0e92e3e..10aeefb 100644
--- a/src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor
+++ b/src/HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor
@@ -1,9 +1,6 @@
-@using HopFrame.Web.Components
-@using BlazorStrap.V5
+@using BlazorStrap.V5
 @inherits LayoutComponentBase
 
-<AuthorizedView Permission="@Security.AdminPermissions.IsAdmin" RedirectIfUnauthorized="administration/login" />
-
 <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 
 <div class="page" style="background-color: #2c3034; position: relative; min-height: 100vh">
diff --git a/src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor b/src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor
index ae96859..aae2c7f 100644
--- a/src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor
+++ b/src/HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor
@@ -66,6 +66,13 @@
     }
 
     private void Logout() {
-        Navigator.NavigateTo("administration/login", true);
+        var redirectString = "";
+
+        if (!Navigator.Uri.EndsWith("administration") && !Navigator.Uri.EndsWith("administration/")) {
+            var parts = Navigator.Uri.Split("administration/");
+            redirectString = "?redirect=" + parts.Last();
+        }
+        
+        Navigator.NavigateTo("administration/login" + redirectString, true);
     }
 }