diff --git a/src/auth/authentication.js b/src/auth/authentication.js
index 727f4e7..d0a1985 100644
--- a/src/auth/authentication.js
+++ b/src/auth/authentication.js
@@ -69,6 +69,13 @@ module.exports = (users) => {
             return res.redirect("/signup");
         }
 
+        let exists = await users.findOne({ email: req.body.email }).then((exists) => exists);
+        if (exists) {
+            req.session.errMessage = "Email already in use";
+            res.status(status.BadRequest);
+            return res.redirect("/signup");                
+        }
+
         if (req.body.password != req.body.repassword) {
             req.session.errMessage = "Passwords must match";
             res.status(status.BadRequest);
diff --git a/src/views/signup.ejs b/src/views/signup.ejs
index 840e839..ac2d8ac 100644
--- a/src/views/signup.ejs
+++ b/src/views/signup.ejs
@@ -15,7 +15,7 @@
                         </div>
                         <div class="mt-3">
                             <label for="email" class="block text-base mb-2">Email</label>
-                            <input type="text" id="email" name="email"
+                            <input type="email" id="email" name="email"
                                 class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                                 placeholder="Enter Email" />
                         </div>