diff --git a/website/public/js/registerAndLogin.js b/website/public/js/registerAndLogin.js
index 4e68a07..92d2281 100644
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -8,4 +8,11 @@ function checkLoggedIn() {
 
 function bannedAlert(){
     alert("Your account is banned");
+}
+
+function emailNotConfirmed(userID){
+    if (confirm("Your email is not confirmed.\nPress ok to send another confirmation.") == true) {
+        sendConfirmEmail(userID);
+    } 
+
 }
\ No newline at end of file
diff --git a/website/public/login.php b/website/public/login.php
index b3a00b0..de4ecab 100644
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -5,6 +5,7 @@
     require_once("../queries/connect.php");
     include_once("../queries/login.php");
     include_once("../queries/checkInput.php");
+    include_once("../queries/emailconfirm.php");
 ?>
 <body>
 <?php
@@ -23,7 +24,7 @@
     // Trying to login
     if ($_SERVER["REQUEST_METHOD"] == "POST") {
         try{
-            $uname = strtolower(test_input($_POST["uname"]));
+            $uname = ($_POST["uname"]);
             validateLogin($_POST["uname"], $_POST["psw"]);
         } catch(loginException $e) {
             $loginErr = $e->getMessage();
diff --git a/website/public/register.php b/website/public/register.php
index 84d6873..1ce4817 100644
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -5,6 +5,7 @@
     require_once("../queries/connect.php");
     include_once("../queries/register.php");
     include_once("../queries/checkInput.php");
+    include_once("../queries/emailconfirm.php");
 ?>
 <body>
 <?php
@@ -91,6 +92,7 @@
         try {
             getIp();
             registerCheck($correct);
+            sendConfirmEmailUsername($username);
         } catch(registerException $e){
             $genericErr = $e->getMessage();
         }
diff --git a/website/queries/login.php b/website/queries/login.php
index 8605e67..2955942 100644
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -34,6 +34,10 @@ function validateLogin($username, $password){
                 echo "<script>
                          window.onload=bannedAlert();
                     </script>";
+            } else if ($role == "unconfirmed"){
+                echo "<script>
+                         window.onload=emailNotConfirmed('userID');
+                    </script>";
             } else {
                 $_SESSION["userID"] = $userID;
                 header("location: profile.php");
