diff --git a/src/domain/Product.java b/src/domain/Product.java
diff --git a/src/domain/ProductSupplier.java b/src/domain/ProductSupplier.java
diff --git a/src/domain/Reservation.java b/src/domain/Reservation.java
diff --git a/src/domain/Stock.java b/src/domain/Stock.java
diff --git a/src/filters/UserFilter.java b/src/filters/UserFilter.java
@@ -0,0 +1,8 @@
+package filters;
+
+/**
+ * Created by InteNs on 04.jun.2015.
+ */
+public class UserFilter {
+
+}
diff --git a/src/listeners/Data.java b/src/listeners/Data.java
@@ -11,11 +11,17 @@
  */
 public class Data implements Serializable {
     private UserController userController = new UserController();
+    //private ProductController productController = new ProductController();
     public Data (){}
 
     public UserController getUserController(){
         return userController;
     }
+
+    //public ProductController getProductController() {
+     //   return productController;
+    //}
+
     public static String convert(double price) {
         NumberFormat nf = NumberFormat.getCurrencyInstance(new Locale("nl", "NL"));
         return nf.format(price);

diff --git a/src/services/controllers/ProductController.java b/src/services/controllers/ProductController.java
diff --git a/src/services/controllers/UserController.java b/src/services/controllers/UserController.java
@@ -3,7 +3,7 @@
 import domain.Customer;
 import domain.User;
 import services.controllers.exceptions.LoginException;
-import services.controllers.exceptions.RegisterException;
+import services.controllers.exceptions.ValidateException;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -87,10 +87,8 @@ public void isLoginValid(String email,String password) throws LoginException {
      * @param email email to check
      * @return true if the user exists
      */
-    public Boolean userExists(String email){
-        return users.stream()
-                .anyMatch(user -> user.getEmail().equals(email));
-
+    public boolean userExists(String email){
+        return users.stream().anyMatch(user -> user.getEmail().equals(email));
     }
 
     /**
@@ -123,7 +121,7 @@ public void changeCustomerInfo(Customer customer,String email, String password,
      * @param address     adress(street + house number)
      * @param dateOfBirth dateOfBirth
      */
-    public void newCustomer(String email,String emailRepeat, String password,String passwordRepeat, String realName,LocalDate dateOfBirth, String address, String postal, String phoneNumber ) throws RegisterException {
+    public void newCustomer(String email,String emailRepeat, String password,String passwordRepeat, String realName,LocalDate dateOfBirth, String address, String postal, String phoneNumber ) throws ValidateException {
         boolean succes = true;
         String ERROR_NULL = "Dit veld mag niet leeg zijn!";
         HashMap<String,String> errorMap = new HashMap<>();
@@ -172,7 +170,7 @@ public void newCustomer(String email,String emailRepeat, String password,String
         if(succes) {
             users.add(new Customer(email, password, realName, dateOfBirth, postal, address, phoneNumber));
         }
-        else throw new RegisterException(errorMap);
+        else throw new ValidateException(errorMap);
 
 
     }

diff --git a/...rollers/exceptions/RegisterException.java → ...rollers/exceptions/ValidateException.java b/...rollers/exceptions/RegisterException.java → ...rollers/exceptions/ValidateException.java
@@ -5,10 +5,10 @@
 /**
  * Created by InteNs on 04.jun.2015.
  */
-public class RegisterException extends Exception {
+public class ValidateException extends Exception {
     private HashMap<String,String> errorMap;
 
-    public RegisterException(HashMap<String, String> errorMap){
+    public ValidateException(HashMap<String, String> errorMap){
         super();
         this.errorMap = errorMap;
     }

diff --git a/src/servlets/LoginServlet.java b/src/servlets/LoginServlet.java
@@ -20,28 +20,29 @@ public class LoginServlet extends HttpServlet {
 
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        RequestDispatcher requestDispatcher = null;
-        ServletContext servletContext = req.getServletContext();
-        UserController userController = ((Data) servletContext.getAttribute("Data")).getUserController();
-        String email = req.getParameter("email");
-        String password = req.getParameter("password");
+        UserController userController = ((Data) req.getServletContext().getAttribute("data")).getUserController();
         String button = req.getParameter("button");
+        System.out.println(button);
+        switch (button) {
+            case "Registreren":
+                System.out.println("registreren");
+                req.setAttribute("register", "register");
+                req.getRequestDispatcher("/index.jsp").forward(req, resp);
+                break;
+            case "Inloggen":
+                System.out.println("inloggen");
+                String email = req.getParameter("email");
+                String password = req.getParameter("password");
 
-        try {
-            userController.isLoginValid(email,password);
-            if(req.getAttribute("keepemail") != null){
-                Cookie c = new Cookie("c_email", email);
-                c.setMaxAge(2000);
-                resp.addCookie(c);
-            }
-            req.getSession().setAttribute("currentuser",userController.findUser(email));
-            requestDispatcher = req.getRequestDispatcher("/secure/welcome.jsp");
-
-        } catch (LoginException e) {
-            req.setAttribute("login_error",e.getMessage());
-            requestDispatcher = req.getRequestDispatcher("/index.jsp");
+                try {
+                    userController.isLoginValid(email, password);
+                    req.getSession().setAttribute("current_user", userController.findUser(email));
+                    if (req.getAttribute("keep_email") != null) resp.addCookie(new Cookie("c_email", email));
+                } catch (LoginException e) {
+                    req.setAttribute("login_error", e.getMessage());
+                }
+                req.getRequestDispatcher("/index.jsp").forward(req, resp);
+                break;
         }
-        requestDispatcher.forward(req, resp);
-
     }
 }
diff --git a/src/servlets/RegisterServlet.java b/src/servlets/RegisterServlet.java
@@ -2,7 +2,7 @@
 
 import services.controllers.UserController;
 import listeners.Data;
-import services.controllers.exceptions.RegisterException;
+import services.controllers.exceptions.ValidateException;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
@@ -20,11 +20,11 @@ public class RegisterServlet extends HttpServlet {
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         ServletContext servletContext = req.getServletContext();
-        UserController userController = ((Data) servletContext.getAttribute("Data")).getUserController();
+        UserController userController = ((Data) servletContext.getAttribute("data")).getUserController();
         String email = req.getParameter("email");
-        String emailRepeat = req.getParameter("emailRepeat");
+        String emailRepeat = req.getParameter("email_repeat");
         String password = req.getParameter("password");
-        String passwordRepeat = req.getParameter("passwordRepeat");
+        String passwordRepeat = req.getParameter("password_repeat");
         String realName = req.getParameter("realname");
         LocalDate dateOfBirth = LocalDate.parse(req.getParameter("date"));
         String address = req.getParameter("address");
@@ -34,7 +34,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         try {
             userController.newCustomer(email, emailRepeat, password, passwordRepeat, realName, dateOfBirth, address, postal, phoneNumber);
             requestDispatcher = req.getRequestDispatcher("/index.jsp");
-        } catch (RegisterException e) {
+        } catch (ValidateException e) {
             requestDispatcher = req.getRequestDispatcher("/registration.jsp");
             for(Map.Entry<String, String> entry : e.getErrorMap().entrySet())
                 req.setAttribute(entry.getKey(),entry.getValue());

diff --git a/src/servlets/addProductServlet.java b/src/servlets/addProductServlet.java
diff --git a/web/component/finance/financeForm.jsp b/web/component/finance/financeForm.jsp
diff --git a/web/component/finance/financeform.css b/web/component/finance/financeform.css
diff --git a/web/component/finance/invoiceForm.jsp b/web/component/finance/invoiceForm.jsp
diff --git a/web/component/finance/invoiceform.css b/web/component/finance/invoiceform.css
diff --git a/web/component/garage/garageForm.jsp b/web/component/garage/garageForm.jsp
diff --git a/web/component/garage/garageform.css b/web/component/garage/garageform.css
diff --git a/web/component/navigation/navigation.jsp b/web/component/navigation/navigation.jsp
@@ -22,13 +22,13 @@
                  <input type="text" name="button" placeholder="wachtwoord"/>
             </span>
             <span class="navigationitem">
-                 <input type="submit" name="button" value="login"/>
+                 <input type="submit" value="Inloggen" name="button"/>
             </span>
             <span class="navigationitem">
                  Registreren:
             </span>
             <span class="navigationitem">
-                <input type="submit" name="button" value="register"/>
+                <input type="submit" value="Registreren" name="button"/>
             </span>
         </form>
 

diff --git a/web/component/parking/parkingForm.jsp b/web/component/parking/parkingForm.jsp
diff --git a/web/component/parking/parkingform.css b/web/component/parking/parkingform.css
diff --git a/web/component/stock/stock.jsp b/web/component/stock/stock.jsp
diff --git a/web/component/stock/stockForm.jsp b/web/component/stock/stockForm.jsp
diff --git a/web/component/stock/stockPanel.css b/web/component/stock/stockPanel.css
diff --git a/web/component/stock/stockPanel.jsp b/web/component/stock/stockPanel.jsp
diff --git a/web/component/stock/stockform.css b/web/component/stock/stockform.css