diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/devices/DeviceServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/devices/DeviceServlet.java
index 6dbeb31e396443afd4619ec2ff3b13afcacd8c0a..4f67a0e77994987c2a67bef280e852b1bab009d9 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/devices/DeviceServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/admin/devices/DeviceServlet.java
@@ -36,10 +36,17 @@ public class DeviceServlet extends HttpServlet {
     protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         String username = req.getParameter("username");
         String deviceId = req.getParameter("deviceId");
-        StatementList statementList = new StatementList();
-        StatementElement st0 = new StatementElement()
+        String deviceName = req.getParameter("deviceName");
+        StatementList update = new StatementList();
+        StatementElement st0 = new StatementElement("deviceName","=",deviceName,"");
+        update.addStatement(st0);
+        StatementList constraint = new StatementList();
         StatementElement st1 = new StatementElement("owner","=",username,"AND");
         StatementElement st2 = new StatementElement("deviceId","=",deviceId,"");
+        update.addStatement(st1);
+        update.addStatement(st2);
+        if(dataStore.getDeviceDao().updateObject(update,constraint)) resp.setStatus(200);
+        else resp.sendError(500,"could not update the device's information!");
     }
 
     //Revoke/delete a device.
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
index d32491e5e457fb439526f3d3b4da4cf0255673da..e7c2b0115071162030cad24d056e5919fc7efba8 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/device/DeviceServlet.java
@@ -47,7 +47,19 @@ public class DeviceServlet extends HttpServlet {
 
     @Override
     protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        super.doPut(req, resp);
+        String username = req.getAttribute("username").toString();
+        String deviceId = req.getParameter("deviceId");
+        String deviceName = req.getParameter("deviceName");
+        StatementList update = new StatementList();
+        StatementElement st0 = new StatementElement("deviceName","=",deviceName,"");
+        update.addStatement(st0);
+        StatementList constraint = new StatementList();
+        StatementElement st1 = new StatementElement("owner","=",username,"AND");
+        StatementElement st2 = new StatementElement("deviceId","=",deviceId,"");
+        update.addStatement(st1);
+        update.addStatement(st2);
+        if(dataStore.getDeviceDao().updateObject(update,constraint)) resp.setStatus(200);
+        else resp.sendError(500,"could not update the device's information!");
     }
 
     @Override