diff --git a/app/common b/app/common
index 485e7e7..bb2c317 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit 485e7e717c64601470fb03fadfdcf2e1f6ebdfd2
+Subproject commit bb2c317fd80cec24861458a120db09dccfe712dd
diff --git a/app/service/service_manager.py b/app/service/service_manager.py
index 4fa4777..09017c4 100644
--- a/app/service/service_manager.py
+++ b/app/service/service_manager.py
@@ -187,12 +187,7 @@ class ServiceManager(IClientHandler):
             client.activate_fail(cid, 'User invalid password')
             return
 
-        found_device = None
-        for device in check_user.devices:
-            if device.id == device_id:
-                found_device = device
-                break
-
+        found_device = check_user.find_device(device_id)
         if not found_device:
             client.activate_fail(cid, 'Device not found')
             return