diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js
index 90da75f7bf4eac0cb8a0fd7d654f53fd3f98ce0d..5ebce451767545d2f04278461483386b2a00d4e9 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.js
+++ b/jams-react-client/src/views/Blueprints/Blueprints.js
@@ -287,11 +287,11 @@ export default function Blueprints() {
                                 <span>No blueprint found</span>
                             :
                                 blueprints.map(blueprint =>
-                                    <GridItem xs={12} sm={12} md={2} key={blueprint.blueprintName}>
+                                    <GridItem xs={12} sm={12} md={2} key={blueprint.groupName}>
 
                                         <Card profile>
                                             <CardBody profile>
-                                                <a href="#" onClick={(e) => redirectToBlueprint(e, blueprint.blueprintName)}>
+                                                <a href="#" onClick={(e) => redirectToBlueprint(e, blueprint.groupName)}>
 
                                                     <h3 className={classes.cardTitle}>{blueprint.groupName ? blueprint.groupName : 'No blueprint name'}</h3>
                                                     <strong>Description:</strong>
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/group/PolicyServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/group/PolicyServlet.java
index a9d369334fec6b526190300fedff4a8162145548..6ae76738e5830e196d056f323cc0c3ae1ca638b8 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/group/PolicyServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/group/PolicyServlet.java
@@ -27,7 +27,7 @@ public class PolicyServlet extends HttpServlet {
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
 
-        List<Group> policies;
+        List<Policy> policies;
         Policy singlePolicy;
 
         if (!req.getParameter("groupName").equals("*")) {
@@ -37,7 +37,7 @@ public class PolicyServlet extends HttpServlet {
             resp.getOutputStream().write(JsonStream.serialize(dataStore.getPolicyDao().getObjects(statementList).get(0)).getBytes());
             resp.setStatus(200);
         } else {
-            policies = dataStore.getGroupDao().getObjects(null);
+            policies = dataStore.getPolicyDao().getObjects(null);
             resp.getOutputStream().write(JsonStream.serialize(policies).getBytes());
             resp.setStatus(200);
         }