Cleaned up code and fixed login.jsp to work and redirect correctly