diff --git a/templates/pages/login.html b/templates/pages/login.html
index 91fb11e..8aec219 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -14,24 +14,32 @@
         <div class="input-icon">
             @
         </div>
-        <input class="input-field" type="email" name="email" placeholder="Email" required>
+        <input class="input-field" type="email" name="email" placeholder="Email">
     </div>
     <div class="input-group">
         <div class="input-icon">
             <img src="/static/icons/padlock.png" alt="user">
         </div>
-        <input class="input-field" type="password" name="password" placeholder="Password" required>
+        <input class="input-field" type="password" name="password" placeholder="Password">
     </div>
     
-    <div class="checkbox-group">
-        <input type="checkbox" name="terms_and_conditions">
-        <div>
-            <p>By checking this checkbox I submit, that read and accepted terms and conditions of this service and home lab.</p>
-        </div>
+    <div class="validation_box" id="validationBox">
+        <p class="validation_box__msg" id="validationMsg">
+        </p>
+    </div>
+
+    <div class="success_box" id="successBox">
+        <p class="success_box__msg" id="successMsg">
+        </p>
     </div>
 
     <button class="button primary login-btn" type="submit">
         Login
     </button>
+
+    <div class="login_link">
+        Don't have an account? <a href="/register">Register</a>
+    </div>
 </form>
+<script src="/static/js/login.js"></script>
 {{ end }}
diff --git a/templates/pages/register.html b/templates/pages/register.html
index ffcda02..bbcb696 100644
--- a/templates/pages/register.html
+++ b/templates/pages/register.html
@@ -14,31 +14,31 @@
         <div class="input-icon">
             <img src="/static/icons/user.png" alt="user">
         </div>
-        <input class="input-field" type="text" name="full_name" placeholder="Full Name" required>
+        <input class="input-field" type="text" name="full_name" placeholder="Full Name*">
     </div>
     <div class="input-group">
         <div class="input-icon">
             @
         </div>
-        <input class="input-field" type="email" name="email" placeholder="Email" required>
+        <input class="input-field" type="email" name="email" placeholder="Email*">
     </div>
     <div class="input-group">
         <div class="input-icon">
             <img src="/static/icons/telephone.png" alt="user">
         </div>
-        <input class="input-field" type="tel" name="phone" placeholder="Phone Number" required>
+        <input class="input-field" type="tel" name="phone" placeholder="Phone Number">
     </div>
     <div class="input-group">
         <div class="input-icon">
             <img src="/static/icons/padlock.png" alt="user">
         </div>
-        <input class="input-field" type="password" name="password" placeholder="Password" required>
+        <input class="input-field" type="password" name="password" placeholder="Password*">
     </div>
     <div class="input-group">
         <div class="input-icon">
             <img src="/static/icons/padlock.png" alt="user">
         </div>
-        <input class="input-field" type="password" name="password" placeholder="Repeat Password" required>
+        <input class="input-field" type="password" name="repeat_password" placeholder="Repeat Password*">
     </div>
     
     <div class="checkbox-group">
@@ -48,8 +48,23 @@
         </div>
     </div>
 
+    <div class="validation_box" id="validationBox">
+        <p class="validation_box__msg" id="validationMsg">
+        </p>
+    </div>
+
+    <div class="success_box" id="successBox">
+        <p class="success_box__msg" id="successMsg">
+        </p>
+    </div>
+
     <button class="button primary register-btn" type="submit">
         Register
     </button>
+
+    <div class="login_link">
+        Already have an account? <a href="/login">Login</a>
+    </div>
 </form>
+<script src="/static/js/register.js"></script>
 {{ end }}