diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
index 00cf70db0e..ac825c211e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
@@ -50,9 +50,9 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
         try {
             OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(saveOtaPackageInfoRequest), saveOtaPackageInfoRequest.isUsesUrl());
 
-            boolean sendToEdge = savedOtaPackageInfo.hasUrl() || savedOtaPackageInfo.isHasData();
+            boolean sendMsgToEdge = savedOtaPackageInfo.hasUrl() || savedOtaPackageInfo.isHasData();
             notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, savedOtaPackageInfo.getId(),
-                    savedOtaPackageInfo, user, actionType, sendToEdge, null);
+                    savedOtaPackageInfo, user, actionType, sendMsgToEdge, null);
 
             return savedOtaPackageInfo;
         } catch (Exception e) {
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java
index d3749236ca..8867c60c59 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java
@@ -36,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 abstract public class BaseEntityViewEdgeTest extends AbstractEdgeTest {
 
     @Test
-    public void testEntityView() throws Exception {
+    public void testEntityViews() throws Exception {
         // create entity view and assign to edge
         edgeImitator.expectMessageAmount(1);
         Device device = findDeviceByName("Edge Device 1");
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java
index db29687683..a2fbc9b968 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java
@@ -62,6 +62,8 @@ abstract public class BaseUserEdgeTest extends AbstractEdgeTest {
         Assert.assertEquals(savedTenantAdmin.getFirstName(), userUpdateMsg.getFirstName());
         Assert.assertEquals(savedTenantAdmin.getLastName(), userUpdateMsg.getLastName());
         testAutoGeneratedCodeByProtobuf(userUpdateMsg);
+        Optional<UserCredentialsUpdateMsg> userCredentialsUpdateMsgOpt = edgeImitator.findMessageByType(UserCredentialsUpdateMsg.class);
+        Assert.assertTrue(userCredentialsUpdateMsgOpt.isPresent());
 
         // update user
         edgeImitator.expectMessageAmount(1);