diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
index b45cfa6..67f75b4 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
@@ -79,7 +79,6 @@
         } catch (IOException e) {
             log.error("Failed to read with path {}", servicePath);
             throw new DynamicChangePropertiesException(String.format("Failed during overwriting %s", serviceName));
-
         }
         return oldFile;
     }
@@ -126,7 +125,7 @@
         }
         for (String secretOrUser : secretsAndUsers) {
             int start = confWithReplacedSecretConf.indexOf(secretOrUser);
-            int end = confWithReplacedSecretConf.indexOf(":", start);
+            int end = confWithReplacedSecretConf.indexOf("\n", start) - 1;
             boolean isTure;
             try {
                 String s = confWithReplacedSecretConf.substring(start, end);