diff --git a/WebContent/html/webpages/logout.jsp b/WebContent/html/webpages/logout.jsp
new file mode 100644
index 0000000..61449b1
--- /dev/null
+++ b/WebContent/html/webpages/logout.jsp
@@ -0,0 +1,21 @@
+<%@ page import = "database.*,entities.User,utilities.Mail" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%
+Cookie[] usercookies = request.getCookies();
+if(usercookies != null){
+	request.getSession();
+	session.removeAttribute("ssoNum");
+	session.invalidate();
+	for(Cookie c : usercookies){
+		if(c.getName().equals("ssoNum")){
+			//delete cookies
+			c.setValue("");
+			c.setMaxAge(0); 
+			response.addCookie(c);
+		}
+	}
+
+response.sendRedirect("../../logout.jsp");
+}
+
+%>
\ No newline at end of file
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
index 4f60228..54b0dd9 100644
--- a/WebContent/html/webpages/navbar.jsp
+++ b/WebContent/html/webpages/navbar.jsp
@@ -22,6 +22,7 @@
 			<li><a href="returnPage.jsp">Return Device</a></li>
 			<li><a href="listingPage.jsp">Device Listing</a></li>
 			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
+			<li><a href="logout.jsp">Logout</a>
 		</ul>
 	</div>
 	<%
@@ -33,12 +34,10 @@
 	//iterate cookies
 	if(usercookies != null){
 		for(Cookie c : usercookies){
-			if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it
+			if(c.getName().equals("ssoNum")){//DO NOT RESET COOKIE NO NEW COOKIES NO NEW COOKIES COOKIES CAN'T DELETE IF COOKIES MADE HERE NO NEW COOKIES
 				navsso = c.getValue(); 
-				c.setMaxAge(0);//delete current
-				newCookie = new Cookie("ssoNum",navsso);//make new one
-				newCookie.setMaxAge(30*60);
-				response.addCookie(newCookie);
+				c.setMaxAge(30*60);
+				response.addCookie(c);
 				break;
 			}
 		}
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index c9e4a6a..61d3a95 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -95,14 +95,14 @@
        <div class = "menuOption">
          <h2>User Login</h2>
          <form action="userLogin.jsp" method="post">
-         	<input class = "form-control" type="text" name="ssoNum" placeholder="SSO Number" /><br>
+         	<input class = "form-control" type="text" pattern="[0-9]{9}" name="ssoNum" placeholder="9 digit SSO Number" /><br>
          	<button type = "submit" value = "Add" class="btn btn-primary">Login</button>
          </form>
          </div>
       <div class = "menuOption">
         <h2>Admin Login</h2> 
          <form action="adminLogin.jsp" method="post">
-         	<input class = "form-control" type="text" name="ssoNum2" placeholder="SSO Number" />
+         	<input class = "form-control" type="text" pattern="[0-9]{9}" name="ssoNum2" placeholder="9 digit SSO Number" />
          	<input class = "form-control" type="password" name="pass"  placeholder="Password" /><br>
          	<button type = "submit" value = "Add" class="btn btn-primary">Login</button>
          </form>
diff --git a/WebContent/logout.jsp b/WebContent/logout.jsp
new file mode 100644
index 0000000..e455bda
--- /dev/null
+++ b/WebContent/logout.jsp
@@ -0,0 +1,20 @@
+<%@ page import = "database.*,entities.User,utilities.Mail" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%
+Cookie[] usercookies = request.getCookies();
+if(usercookies != null){
+	request.getSession();
+	session.removeAttribute("ssoNum");
+	session.invalidate();
+	for(Cookie c : usercookies){
+		if(c.getName().equals("ssoNum")){
+			//delete cookies
+			c.setValue("");
+			c.setMaxAge(0); 
+			response.addCookie(c);
+		}
+	}
+
+response.sendRedirect("index.jsp");
+}
+%>
\ No newline at end of file
diff --git a/WebContent/userLogin.jsp b/WebContent/userLogin.jsp
index 54f84ca..bcf2c9d 100644
--- a/WebContent/userLogin.jsp
+++ b/WebContent/userLogin.jsp
@@ -5,8 +5,10 @@
 <%
 int ssoNum;
 Cookie userCookie;
+
 ssoNum = Integer.parseInt(request.getParameter("ssoNum"));
-System.getenv("VCAP_SERVICES");
+int ssoLength = (int)(Math.log10(ssoNum)+1);
+
 Class.forName("com.mysql.jdbc.Driver");
 String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317";
 String user = "b372dfe7409692";