diff --git a/src/html/assets/css/bs.signin.css b/src/html/assets/css/bs.signin.css
index 4732d1f..7d572ba 100644
--- a/src/html/assets/css/bs.signin.css
+++ b/src/html/assets/css/bs.signin.css
@@ -26,14 +26,24 @@ body {
   z-index: 2;
 }
 
-.form-signin input[type="email"] {
+.token-input {
   margin-bottom: -1px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-.form-signin input[type="password"] {
+
+.password-input {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.new-password-input {
   margin-bottom: 10px;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
+
diff --git a/src/html/index.html b/src/html/index.html
index 4a75ede..6814114 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Hugo 0.88.1">
-    <title>Zorg Gravatar Server</title>
+    <title>Zorg Avatar Server &bull; Home</title>
 
     <link rel="canonical" href="https://getbootstrap.com/examples/sticky-footer-navbar/">
     <!-- Bootstrap core CSS -->
@@ -33,20 +33,20 @@
       <header class="mb-auto">
         <div>
           <h3 class="float-md-start mb-0">
-            <img src="/assets/img/brand/zorg/zorg.logo.32.png" alt="Zorg Gravatar Server"> Zorg Gravatar Server
+            <img src="/assets/img/brand/zorg/zorg.logo.32.png" alt="Zorg Avatar Server"> Zorg Avatar Server
           </h3>
           <nav class="nav nav-masthead justify-content-center float-md-end">
             <a class="nav-link active" aria-current="page" href="/"><i class="bi bi-house-fill"></i> Home</a>
-            <a class="nav-link" href="https://github.com/ZorgCC/gravatar-server/wiki" target="_blank"><i class="bi bi-life-preserver"></i> Docs</a>
-            <a class="nav-link" href="https://github.com/ZorgCC/gravatar-server" target="_blank"><i class="bi bi-git"></i> Sources</a>
+            <a class="nav-link" href="https://github.com/ZorgCC/avatar-server/wiki" target="_blank"><i class="bi bi-journal-text"></i> Docs</a>
+            <a class="nav-link" href="https://github.com/ZorgCC/avatar-server" target="_blank"><i class="bi bi-git"></i> Sources</a>
             <a class="nav-link" href="/login.html"><i class="bi bi-door-open"></i> Login</a>
           </nav>
         </div>
       </header>
     
       <main class="px-3">
-        <h1>Welcome to Zorg Gravatar Server</h1>
-        <p class="lead">Open source free, Gravatar-compatible avatar lightweight server written in php with simple admin panel.</p>
+        <h1>Welcome to Zorg Avatar Server</h1>
+        <p class="lead">Open source and free, Gravatar-compatible avatar lightweight server written in php with simple admin panel.</p>
         <p class="lead">
           <a href="/login.html" class="btn btn-lg btn-secondary fw-bold border-white bg-white">Cool! <i class="bi bi-lightning"></i> Get started!</a>
         </p>
@@ -54,7 +54,7 @@
     
       <footer class="mt-auto text-white-50">
         <p>
-          Gravatar Server v0.1, <i class="bi bi-github"></i> <a href="https://github.com/ZorgCC/gravatar-server" class="text-white">Source code</a>,
+          Zorg Avatar Server v0.1, <i class="bi bi-github"></i> <a href="https://github.com/ZorgCC/avatar-server" class="text-white">Source code</a>,
            by <a href="https://zorg.cc" class="text-white">Zorg Software Team</a>.</p>
       </footer>
     </div>
diff --git a/src/html/login.html b/src/html/login.html
index ae905e8..ca27609 100644
--- a/src/html/login.html
+++ b/src/html/login.html
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Hugo 0.88.1">
-    <title>Zorg Gravatar Server</title>
+    <title>Zorg Avatar Server &bull; Sign In</title>
 
     <link rel="canonical" href="https://getbootstrap.com/examples/sticky-footer-navbar/">
     <!-- Bootstrap core CSS -->
@@ -31,21 +31,25 @@
     
     <main class="form-signin">
       <form>
-        <img class="mb-4" src="/assets/img/brand/zorg/zorg.logo.72.png" alt="" width="72" height="72">
-        <h1 class="h3 mb-3 fw-normal  position-relative">Please Sign in  <span class="position-absolute top-0 start-100 translate-middle badge border border-light rounded-circle "><i class="bi bi-info-circle" data-bs-toggle="tooltip" data-bs-placement="right" title="The token is printed in the server console and gravatar-server.log under the logs directory."></i></span></h1>
-    
+        <img class="mb-4" src="/assets/img/brand/zorg/zorg.logo.72.png" alt="" width="72" height="72" title="Zorg Avatar Server">
+        <h1 class="h3 mb-3 fw-normal  position-relative">Please Sign in  <span class="position-absolute top-0 start-100 translate-middle badge border border-light rounded-circle "><i class="bi bi-info-circle" data-bs-toggle="tooltip" data-bs-placement="right" title="The password has been defined via installation, if you forgot it - you can reset it with your server's console."></i></span></h1>
+       
+        <div class="alert alert-warning alert-dismissible fade show" role="alert">
+          <strong>Holy guacamole!</strong> You should check in on some of those fields below.
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+
         <div class="form-floating">
-          <input type="password" class="form-control" id="floatingPassword" placeholder="Token">
-          <label for="floatingPassword">Token</label>
+          <input type="password" class="form-control password-input" id="floatingPassword" placeholder="Password">
+          <label for="floatingPassword">Password</label>
         </div>
     
-        <div class="checkbox mb-3">
-          <label>
-            <input type="checkbox" value="remember-me"> Remember me
-          </label>
+        <button class="w-100 btn btn-lg btn-primary" type="submit"><i class="bi bi-key"></i> Sign in</button>
+
+        <div class="mb-3">
+          <a href="/reset.html"><i class="bi bi-life-preserver"></i> Forgot your password?</a>
         </div>
-        <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
-        <p class="mt-5 mb-3 text-muted">Gravatar Server v0.1, <br><i class="bi bi-github"></i> <a href="https://github.com/ZorgCC/gravatar-server" class="text-white">Source code</a>,
+        <p class="mt-5 mb-3 text-muted">Zorg Avatar Server v0.1, <br><i class="bi bi-github"></i> <a href="https://github.com/ZorgCC/avatar-server" class="text-white">Source code</a>,
           by <a href="https://zorg.cc" class="text-white">Zorg Software Team</a>.</p>
       </form>
     </main>