diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
index b647029..b44f3f2 100644
--- a/WebContent/html/webpages/navbar.jsp
+++ b/WebContent/html/webpages/navbar.jsp
@@ -31,14 +31,16 @@
 	User self = new User();
 	Cookie newCookie;
 	//iterate cookies
-	for(Cookie c : usercookies){
-		if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it
-			navsso = c.getValue(); 
-			c.setMaxAge(0);//delete current
-			newCookie = new Cookie("ssoNum",navsso);//make new one
-			newCookie.setMaxAge(30*60);
-			response.addCookie(newCookie);
-			break;
+	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
+				navsso = c.getValue(); 
+				c.setMaxAge(0);//delete current
+				newCookie = new Cookie("ssoNum",navsso);//make new one
+				newCookie.setMaxAge(30*60);
+				response.addCookie(newCookie);
+				break;
+			}
 		}
 	}
 	if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index 30bb744..81aecdd 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -1,4 +1,4 @@
-<%@ page import = "database.*" %>
+<%@ page import = "database.*,entities.User" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <%@ page import = "java.sql.*" %>
@@ -111,3 +111,26 @@
 </div>
 </body>
 </html>
+
+<%
+Cookie[] usercookies = request.getCookies();
+String navsso = "invalid";
+String navname = "error";
+User self = new User();
+Cookie newCookie;
+//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
+			navsso = c.getValue(); 
+			c.setMaxAge(0);//delete current
+			newCookie = new Cookie("ssoNum",navsso);//make new one
+			newCookie.setMaxAge(30*60);
+			response.addCookie(newCookie);
+			break;
+		}
+	}
+}
+if(navsso.equals("invalid") == false)//if we did get cookie, redirect to the homepage!
+	response.sendRedirect("html/webpages/index.jsp");
+ %>