diff --git a/faces-config.NavData b/faces-config.NavData
index 187ec92..298bfc5 100644
--- a/faces-config.NavData
+++ b/faces-config.NavData
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scene Scope="Project" version="2">
-    <Scope Scope="Faces Configuration Only"/>
-    <Scope Scope="Project"/>
-    <Scope Scope="All Faces Configurations"/>
-</Scene>
+<?xml version="1.0" encoding="UTF-8"?>
+<Scene Scope="Project" version="2">
+    <Scope Scope="Faces Configuration Only"/>
+    <Scope Scope="Project"/>
+    <Scope Scope="All Faces Configurations"/>
+</Scene>
diff --git a/src/main/java/dat076/frukostklubben/bb/CustomerController.java b/src/main/java/dat076/frukostklubben/bb/CustomerController.java
index 439bff1..fbc8210 100644
--- a/src/main/java/dat076/frukostklubben/bb/CustomerController.java
+++ b/src/main/java/dat076/frukostklubben/bb/CustomerController.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package dat076.frukostklubben.bb;
 
 import java.util.ArrayList;
diff --git a/src/main/java/dat076/frukostklubben/bb/SignupBB.java b/src/main/java/dat076/frukostklubben/bb/SignupBB.java
index 235cb54..dc93104 100644
--- a/src/main/java/dat076/frukostklubben/bb/SignupBB.java
+++ b/src/main/java/dat076/frukostklubben/bb/SignupBB.java
@@ -1,11 +1,7 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package dat076.frukostklubben.bb;
 
-import dat076.frukostklubben.ejb.CustomerEJB;
-import dat076.frukostklubben.model.Customer;
+import dat076.frukostklubben.ejb.UserEJB;
+import dat076.frukostklubben.model.User;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.application.FacesMessage;
@@ -16,20 +12,19 @@
 /**
  *
  * @author Julia
+ * Edited by: Anders, 2012-10-17
  */
 @Named("signup")
-@RequestScoped //created once for every request
+@RequestScoped 
 public class SignupBB {
-
+    
     // ======================================
     // =             Attributes             =
     // ======================================
 
     @EJB
-    CustomerEJB customerRegistry;
-    
-    private Customer customer = new Customer();
-    
+    UserEJB userRegistry;    
+    private User user = new User();    
     private String passwdConfirm;
 
     // ======================================
@@ -37,13 +32,12 @@ public class SignupBB {
     // ======================================
     
     public String doCreateCustomer() {
-        //log.log(Level.INFO, "New Customer Login {0} Passwd {1}", new Object[]{login, passwd});
         try {
-            customer = customerRegistry.createCustomer(customer);
-            return "index.xhtml"; //or some confirmation page
+            user = userRegistry.createUser(user);
+            return "index.xhtml"; 
         } catch (Exception e) {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("Bad Login name"));
-            return null; // Same page
+            return null; // Stay on same page
         }
     }
 
@@ -51,17 +45,16 @@ public String doCreateCustomer() {
     // =          Getters & Setters         =
     // ======================================
    
-    public Customer getCustomer(){
-        return this.customer;
+    public User getUser(){
+        return this.user;
     }
     
-    public void setCutomer(Customer customer){
-        this.customer = customer;
+    public void setUser(User user){
+        this.user = user;
     }
     
     public void passwdConfirm(String passwdConfirm){
         this.passwdConfirm = passwdConfirm;
-        //do something real...
     }
     
     public String getpasswdConfirm(){
diff --git a/src/main/java/dat076/frukostklubben/ejb/CustomerEJB.java b/src/main/java/dat076/frukostklubben/ejb/CustomerEJB.java
deleted file mode 100644
index 3afc03f..0000000
--- a/src/main/java/dat076/frukostklubben/ejb/CustomerEJB.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dat076.frukostklubben.ejb;
-
-import dat076.frukostklubben.model.Customer;
-import java.util.List;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-/**
- *
- * @author freein
- */
-@Stateless
-@LocalBean
-public class CustomerEJB implements CustomerEJBRemote {
-
-    @PersistenceContext(unitName = "projectPU")
-    private EntityManager em;
-    
-    @Override
-    public List<Customer> findCustomers() {
-        TypedQuery<Customer> query = em.createNamedQuery("findAllCustomers", Customer.class);
-        return query.getResultList();
-    }
-
-    @Override
-    public Customer findCustomerById(Long id) {
-        return em.find(Customer.class, id);
-    }
-
-    @Override
-    public Customer createCustomer(Customer customer) {
-        em.persist(customer);
-        return customer;
-    }
-
-    @Override
-    public void deleteCustomer(Customer customer) {
-        em.remove(em.merge(customer));
-    }
-
-    @Override
-    public Customer updateCustomer(Customer customer) {
-        return em.merge(customer);
-    }
-}
diff --git a/src/main/java/dat076/frukostklubben/ejb/CustomerEJBRemote.java b/src/main/java/dat076/frukostklubben/ejb/CustomerEJBRemote.java
deleted file mode 100644
index 2747588..0000000
--- a/src/main/java/dat076/frukostklubben/ejb/CustomerEJBRemote.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dat076.frukostklubben.ejb;
-
-import dat076.frukostklubben.model.Customer;
-import java.util.List;
-import javax.ejb.Remote;
-
-/**
- *
- * @author freein
- */
-@Remote
-public interface CustomerEJBRemote {
-    List<Customer> findCustomers();
-    Customer findCustomerById(Long id);
-    Customer createCustomer(Customer customer);
-    void deleteCustomer(Customer customer);
-    Customer updateCustomer(Customer customer);
-}
diff --git a/src/main/java/dat076/frukostklubben/ejb/UserEJB.java b/src/main/java/dat076/frukostklubben/ejb/UserEJB.java
new file mode 100644
index 0000000..0decf38
--- /dev/null
+++ b/src/main/java/dat076/frukostklubben/ejb/UserEJB.java
@@ -0,0 +1,49 @@
+package dat076.frukostklubben.ejb;
+
+import dat076.frukostklubben.model.User;
+import java.util.List;
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+/**
+ *
+ * @author freein
+ * Edited by: Anders, 2012-10-17
+ */
+@Stateless
+@LocalBean
+public class UserEJB implements UserEJBRemote {
+
+    @PersistenceContext(unitName = "projectPU")
+    private EntityManager em;
+    
+    @Override
+    public List<User> findUsers() {
+        TypedQuery<User> query = em.createNamedQuery("findAllUsers", User.class);
+        return query.getResultList();
+    }
+
+    @Override
+    public User findUserById(Long id) {
+        return em.find(User.class, id);
+    }
+
+    @Override
+    public User createUser(User user) {
+        em.persist(user);
+        return user;
+    }
+
+    @Override
+    public void deleteUser(User user) {
+        em.remove(em.merge(user));
+    }
+
+    @Override
+    public User updateUser(User user) {
+        return em.merge(user);
+    }
+}
diff --git a/src/main/java/dat076/frukostklubben/ejb/UserEJBRemote.java b/src/main/java/dat076/frukostklubben/ejb/UserEJBRemote.java
new file mode 100644
index 0000000..7fd0873
--- /dev/null
+++ b/src/main/java/dat076/frukostklubben/ejb/UserEJBRemote.java
@@ -0,0 +1,19 @@
+package dat076.frukostklubben.ejb;
+
+import dat076.frukostklubben.model.User;
+import java.util.List;
+import javax.ejb.Remote;
+
+/**
+ *
+ * @author freein
+ * Edited by: Anders, 2012-10-17
+ */
+@Remote
+public interface UserEJBRemote {
+    List<User> findUsers();
+    User findUserById(Long id);
+    User createUser(User customer);
+    void deleteUser(User customer);
+    User updateUser(User customer);
+}
diff --git a/src/main/java/dat076/frukostklubben/model/Customer.java b/src/main/java/dat076/frukostklubben/model/User.java
similarity index 72%
rename from src/main/java/dat076/frukostklubben/model/Customer.java
rename to src/main/java/dat076/frukostklubben/model/User.java
index 7253ffe..a1a3400 100644
--- a/src/main/java/dat076/frukostklubben/model/Customer.java
+++ b/src/main/java/dat076/frukostklubben/model/User.java
@@ -17,10 +17,19 @@
 /**
  *
  * @author Fredrik
+ * Edited by: Anders, 2012-10-17
  */
 @Entity
-@NamedQuery(name = "findAllCustomers", query = "SELECT c FROM Customer c")
-public class Customer implements Serializable {
+@NamedQuery(name = "findAllUsers", query = "SELECT u FROM User u")
+public class User implements Serializable {
+    
+    // Access level for user account. 
+    public enum Access{
+        ADMIN,
+        USER
+    }
+    
+    
      @Id @GeneratedValue
      private long id;
      
@@ -31,15 +40,19 @@ public class Customer implements Serializable {
      @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
      private Address address;
      private String password;
+     private Access access;
 
-    public Customer(String firstName, String lastName, String mail, Address address) {
+
+
+    public User(String firstName, String lastName, String mail, Address address, Access access) {
         this.firstName = firstName;
         this.lastName = lastName;
         this.mail = mail;
         this.address = address;
+        this.access = access;
     }
 
-    public Customer() {
+    public User() {
     }
 
     public long getId() {
@@ -52,9 +65,7 @@ public String getPassword() {
 
     public void setPassword(String password) {
         this.password = password;
-    }
-    
-    
+    }   
 
     public void setId(long id) {
         this.id = id;
@@ -91,6 +102,12 @@ public Address getAddress() {
     public void setAddress(Address address) {
         this.address = address;
     }
-     
-     
+    
+    public void setAccess(Access access) {
+        this.access = access;
+    }
+
+    public Access getAccess() {
+        return access;
+    }
 }
diff --git a/src/main/webapp/pages/index.xhtml b/src/main/webapp/pages/index.xhtml
index 7e96162..e5def55 100644
--- a/src/main/webapp/pages/index.xhtml
+++ b/src/main/webapp/pages/index.xhtml
@@ -6,7 +6,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:ace="http://www.icefaces.org/icefaces/components">
     <h:body>
-
         <ui:composition template="/jsf/template/template.xhtml">
             <ui:define name="content">
                 <article>
@@ -14,25 +13,20 @@
                         <h1>Search for a flight now!</h1>                        
                     </header>
                     <h:form>
-                            <p><label for="from">From:</label><br/>
+                        <p><label for="from">From:</label><br/>
                             <ace:textEntry id="from" value="#{search.flight.fromAirport}"  styleClass="inputForm"  /></p>
-                            
-                            <p><label for="to">To:</label><br/>
-                                <ace:textEntry id="to" value="#{search.flight.toAirport}" styleClass="inputForm" /></p>
-                           
-                            <p><label for="price">Price:</label><br/>
-                                <ace:textEntry id="price" value="#{search.flight.cost}" styleClass="inputForm" /></p>
-                            
+
+                        <p><label for="to">To:</label><br/>
+                            <ace:textEntry id="to" value="#{search.flight.toAirport}" styleClass="inputForm" /></p>
+
+                        <p><label for="price">Price:</label><br/>
+                            <ace:textEntry id="price" value="#{search.flight.cost}" styleClass="inputForm" /></p>
+
                         <ace:pushButton value="Search Travel"  action="#{search.search}"/>                     
-                        
+
                     </h:form>
                 </article>
             </ui:define>
-
-
-
         </ui:composition>
-
     </h:body>
-
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/pages/signup.xhtml b/src/main/webapp/pages/signup.xhtml
index 046f5a8..1c513e4 100644
--- a/src/main/webapp/pages/signup.xhtml
+++ b/src/main/webapp/pages/signup.xhtml
@@ -20,30 +20,30 @@
 
                 <h:form>
                     <p><h:outputLabel for="mail" value="E-mail*:" /><br />
-                    <h:inputText id="mail" value="#{signup.customer.mail}" size="10" required="required" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="mail" value="#{signup.user.mail}" size="10" required="required" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="firstName" value="First name*:" /><br />
-                    <h:inputText id="firstName" value="#{signup.customer.firstName}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="firstName" value="#{signup.user.firstName}" size="10" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="lastName" value="Last name*:" /><br />
-                    <h:inputText id="lastName" value="#{signup.customer.lastName}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="lastName" value="#{signup.user.lastName}" size="10" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="street" value="Street Address*:" /><br />
-                    <h:inputText id="street" value="#{signup.customer.address.streetAddress}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="street" value="#{signup.user.address.streetAddress}" size="10" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="zip" value="Zip Code*:" /><br />
-                    <h:inputText id="zip" value="#{signup.customer.address.zip}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="zip" value="#{signup.user.address.zip}" size="10" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="city" value="City*:" /><br />
-                    <h:inputText id="city" value="#{signup.customer.address.city}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputText id="city" value="#{signup.user.address.city}" size="10" autocomplete="off" class="inputForm"/></p>
 
                     <p><h:outputLabel for="passwd" value="Password*:" /><br />
-                    <h:inputSecret id="passwd" value="#{signup.customer.password}" size="10" autocomplete="off" class="inputForm"/></p>
+                    <h:inputSecret id="passwd" value="#{signup.user.password}" size="10" autocomplete="off" class="inputForm"/></p>
                     
                     <p><h:outputLabel for="passwdConfirm" value="Confirm Password*:" /><br />
                     <h:inputSecret id="passwdConfirm" value="#{signup.passwdConfirm}" size="10" autocomplete="off" class="inputForm"/></p>
 
-                    <footer><h:commandButton id="register" value="Register" class="inputButton" action="#{signup.doCreateCustomer}" />
+                    <footer><h:commandButton id="register" value="Register" class="inputButton" action="#{signup.doCreateUser}" />
                         <h:button outcome="signup" value="Clear" class="inputButton" /></footer>
                 </h:form>
             </ui:define>
diff --git a/src/test/java/dat076/frukostklubben/test/CustomerEJBTest.java b/src/test/java/dat076/frukostklubben/test/CustomerEJBTest.java
deleted file mode 100644
index e78aaa1..0000000
--- a/src/test/java/dat076/frukostklubben/test/CustomerEJBTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dat076.frukostklubben.test;
-
-import dat076.frukostklubben.ejb.CustomerEJB;
-import dat076.frukostklubben.model.Address;
-import dat076.frukostklubben.model.Customer;
-import java.util.List;
-import javax.ejb.embeddable.EJBContainer;
-import junit.framework.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- * @author freein
- */
-public class CustomerEJBTest {
-        // ======================================
-    // =             Fields             =
-    // ======================================
-    private static EJBContainer ec;
-    private static CustomerEJB customerEJB;
-
-    // ======================================
-    // =          Lifecycle Methods         =
-    // ======================================
-
-    @BeforeClass
-    public static void initContainer() throws Exception {
-        //Create an Ejb container and put in an CustomerEJB instance
-        ec = EJBContainer.createEJBContainer();
-        customerEJB = (CustomerEJB)ec.getContext().
-                lookup("java:global/classes/CustomerEJB!dat076.frukostklubben.ejb.CustomerEJB");
-    }
-
-    @AfterClass
-    public static void closeContainer() throws Exception {
-        if (ec != null){
-            ec.close();
-        }
-    }
-    
-    @Test
-    public void testCustomer() throws Exception{
-        // Creates an instance of Customer
-        Customer customer = new Customer("Anders", "Nordin", "mail@mail.com", new Address());
-        
-        // Persists the customer to the database
-        customer  = customerEJB.createCustomer(customer);
-        Assert.assertNotNull(customer);
-        
-        // Retrieves all the customers from the database
-        List<Customer> customers = customerEJB.findCustomers();
-        Assert.assertNotNull(customers);
-        
-        //Gets a customer by its id
-        Customer customer2 = customerEJB.findCustomerById(customer.getId());
-        Assert.assertEquals(customer2.getId(), customer.getId());
-        
-        //Updating the customer
-        customer.setMail("Anders@mail.com");
-        customerEJB.updateCustomer(customer);
-        Customer customer3 = customerEJB.findCustomerById(customer.getId());
-        Assert.assertEquals(customer3.getMail(),"Anders@mail.com");
-        
-                
-        //If we delete the last customer the list of customers should på empty.
-        customerEJB.deleteCustomer(customer);
-        customers = customerEJB.findCustomers();
-        Assert.assertTrue(customers.isEmpty());   
- 
-    }
-}
diff --git a/src/test/java/dat076/frukostklubben/test/UserEJBTest.java b/src/test/java/dat076/frukostklubben/test/UserEJBTest.java
new file mode 100644
index 0000000..0108590
--- /dev/null
+++ b/src/test/java/dat076/frukostklubben/test/UserEJBTest.java
@@ -0,0 +1,74 @@
+package dat076.frukostklubben.test;
+
+import dat076.frukostklubben.ejb.UserEJB;
+import dat076.frukostklubben.model.Address;
+import dat076.frukostklubben.model.User;
+import java.util.List;
+import javax.ejb.embeddable.EJBContainer;
+import junit.framework.Assert;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author freein
+ * Edit by: Anders, 2012-10-17
+ */
+public class UserEJBTest {
+        // ======================================
+    // =             Fields             =
+    // ======================================
+    private static EJBContainer ec;
+    private static UserEJB userEJB;
+
+    // ======================================
+    // =          Lifecycle Methods         =
+    // ======================================
+
+    @BeforeClass
+    public static void initContainer() throws Exception {
+        //Create an Ejb container and put in an UserEJB instance
+        ec = EJBContainer.createEJBContainer();
+        userEJB = (UserEJB)ec.getContext().
+                lookup("java:global/classes/UserEJB!dat076.frukostklubben.ejb.UserEJB");
+    }
+
+    @AfterClass
+    public static void closeContainer() throws Exception {
+        if (ec != null){
+            ec.close();
+        }
+    }
+    
+    @Test
+    public void testUser() throws Exception{
+        // Creates an instance of User
+        User user = new User("Anders", "Nordin", "mail@mail.com", new Address(), User.Access.USER);
+        
+        // Persists the user to the database
+        user  = userEJB.createUser(user);
+        Assert.assertNotNull(user);
+        
+        // Retrieves all the users from the database
+        List<User> users = userEJB.findUsers();
+        Assert.assertNotNull(users);
+        
+        //Gets a user by its id
+        User user2 = userEJB.findUserById(user.getId());
+        Assert.assertEquals(user2.getId(), user.getId());
+        
+        //Updating the user
+        user.setMail("Anders@mail.com");
+        userEJB.updateUser(user);
+        User user3 = userEJB.findUserById(user.getId());
+        Assert.assertEquals(user3.getMail(),"Anders@mail.com");
+        
+                
+        //If we delete the last user the list of users should på empty.
+        userEJB.deleteUser(user);
+        users = userEJB.findUsers();
+        Assert.assertTrue(users.isEmpty());   
+ 
+    }
+}