Index: sources/app/src/main/java/parkup/entities/Administrator.java
===================================================================
--- sources/app/src/main/java/parkup/entities/Administrator.java	(revision 9dd526f0ddf9a23ad37dd4c977f761ff959f5913)
+++ sources/app/src/main/java/parkup/entities/Administrator.java	(revision 98f448a5217d1b04c85405d87889e64c1b6debb3)
@@ -51,5 +51,5 @@
 
     public Administrator(){
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }
@@ -63,5 +63,5 @@
         this.mobile = mobile;
         this.enabled=true;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
     }
 
@@ -72,5 +72,5 @@
         this.password = password;
         this.mobile = mobile;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }
@@ -82,5 +82,5 @@
         this.password = password;
         this.mobile = mobile;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }
Index: sources/app/src/main/java/parkup/entities/Guest.java
===================================================================
--- sources/app/src/main/java/parkup/entities/Guest.java	(revision 9dd526f0ddf9a23ad37dd4c977f761ff959f5913)
+++ sources/app/src/main/java/parkup/entities/Guest.java	(revision 98f448a5217d1b04c85405d87889e64c1b6debb3)
@@ -47,5 +47,5 @@
 
 
-    public Guest() {this.role=UserRole.GUEST;}
+    public Guest() {this.role=UserRole.ROLE_USER;}
 
     public Guest(int guestId, Plate plate, String email, String mobile) {
@@ -54,5 +54,5 @@
         this.email = email;
         this.mobile = mobile;
-        this.role=UserRole.GUEST;
+        this.role=UserRole.ROLE_USER;
     }
 
@@ -61,5 +61,5 @@
         this.email = email;
         this.mobile = mobile;
-        this.role=UserRole.GUEST;
+        this.role=UserRole.ROLE_USER;
     }
 
Index: sources/app/src/main/java/parkup/entities/RegisteredUser.java
===================================================================
--- sources/app/src/main/java/parkup/entities/RegisteredUser.java	(revision 9dd526f0ddf9a23ad37dd4c977f761ff959f5913)
+++ sources/app/src/main/java/parkup/entities/RegisteredUser.java	(revision 98f448a5217d1b04c85405d87889e64c1b6debb3)
@@ -62,5 +62,5 @@
     public RegisteredUser() {
         this.plates = new ArrayList<Plate>();
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -74,5 +74,5 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -85,5 +85,5 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -95,5 +95,5 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
Index: sources/app/src/main/java/parkup/entities/Worker.java
===================================================================
--- sources/app/src/main/java/parkup/entities/Worker.java	(revision 9dd526f0ddf9a23ad37dd4c977f761ff959f5913)
+++ sources/app/src/main/java/parkup/entities/Worker.java	(revision 98f448a5217d1b04c85405d87889e64c1b6debb3)
@@ -60,5 +60,5 @@
     private UserRole role;
 
-    @ManyToMany(cascade = {CascadeType.ALL})
+    @ManyToMany
     private List<ParkingZone> parkingZones;
 
@@ -78,5 +78,5 @@
 
     public Worker() {
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.parkingZones = new ArrayList<ParkingZone>();
         this.enabled = true;
@@ -92,5 +92,5 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
@@ -104,5 +104,5 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
@@ -116,5 +116,5 @@
         this.mobile=mobile;
         this.parkingZones=new ArrayList<>();
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled=true;
         this.status = EmployeeStatus.NOT_WORKING;
