diff --git a/signup_form/css/style.css b/signup_form/css/style.css
index 5b19b22..92dbf97 100644
--- a/signup_form/css/style.css
+++ b/signup_form/css/style.css
@@ -2,6 +2,7 @@
     --main-bg: #C4DFDF;
     --light-bg: #F8F6F4;
     --text-color: rgb(22, 72, 99);
+    --error-color: #EF6262;
 }
 
 
@@ -74,6 +75,14 @@
     margin-bottom: 5px;
 }
 
+
+.error {
+    color: var(--error-color);
+    font-size: 0.85rem;
+    margin-left: 5px;
+}
+
+
 @media only screen and (min-width: 700px) {
     .container {
         flex-direction: row;
@@ -147,3 +156,7 @@ body {
     font-size: 16px;
     color: var(--text-color);
 }
+
+button {
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/signup_form/index.html b/signup_form/index.html
index 4eec80b..ea0301a 100644
--- a/signup_form/index.html
+++ b/signup_form/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-    <title>Join Our Awesome Mailing list!</title>
+    <title>Sign up! | Smig.Tech™</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="preconnect" href="https://fonts.googleapis.com">
@@ -20,7 +20,7 @@
             </div>
         </div>
         <div class="form">
-            <h1 class="call-to-action">Join our mailing list!</h1>
+            <h1 class="call-to-action">Sign up today!</h1>
             <form action="" method="#">
                 <div class="form-input">
                     <label for="name">NAME</label>
@@ -33,11 +33,13 @@
                 <div class="form-input">
                     <label for="password">PASSWORD</label>
                     <input type="password" name="password" id="password" required minlength="8">
+                    <div class="error"></div>
                 </div>
                 <div class="form-input">
                     <label for="password-confirmation">CONFIRM PASSWORD</label>
                     <input type="password" name="password-confirmation" id="password-confirmation" required
                         minlength="8">
+                    <div class="error"></div>
                 </div>
                 <div class="form-button">
                     <button type="submit">Sign Up</button>
diff --git a/signup_form/js/script.js b/signup_form/js/script.js
index f82fe09..62b893d 100644
--- a/signup_form/js/script.js
+++ b/signup_form/js/script.js
@@ -1,14 +1,31 @@
 const name = document.querySelector('#name'),
       email = document.querySelector('#email'),
       password = document.querySelector('#password'),
-      passwordConfirmation = document.querySelector('#password-confirmation')
+      passwordConfirmation = document.querySelector('#password-confirmation'),
+      formInputs = document.querySelectorAll('.form-input')
 
+password.addEventListener('keyup', e => {
+    let error = '*Password must be at least 8 characters!';
+    let errorDiv = password.nextElementSibling;
 
-
-passwordConfirmation.addEventListener('keyup', e => {
-    if (password.value === e.target.value ) {
-        console.log('they equal');
+    if (password.value.length < 8) {
+        password.style.borderColor = "#EF6262";
+        errorDiv.textContent = error;
     } else {
-        console.log('They don\'t equal');
+        password.style.borderColor = "";
+        errorDiv.textContent = "";
     }
 })
+
+passwordConfirmation.addEventListener('keyup', e => {
+    let error = '*Passwords do not match!';
+    let errorDiv = passwordConfirmation.nextElementSibling;
+
+    if (password.value !== e.target.value ) {
+        passwordConfirmation.style.borderColor = "#EF6262";
+        errorDiv.textContent = error;
+    } else {
+        passwordConfirmation.style.borderColor = "";
+        errorDiv.textContent = "";
+    }
+});
