diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
index 976baf529821b5041a047b591092232ea7764d03..2d93d77bf531b7328e497627ea15f158ba67f1da 100644
--- a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
+++ b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
@@ -26,7 +26,7 @@ public class UserDataCommonComponent extends DomiSMPPage {
     private WebElement fullNameInput;
     @FindBy(id = "passwordUpdatedOn_id")
     private WebElement lastSetLbl;
-    @FindBy(id = "passwordExpireOnMessage_id")
+    @FindBy(id = "passwordExpireOn_id")
     private WebElement passwordExpiresOnLbl;
 
     public UserDataCommonComponent(WebDriver driver) {
diff --git a/domiSMP-ui-tests/src/main/java/pages/LoginPage.java b/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
index ad8f31f6dfc6f8ab525840f00e7e6dce9ee85c48..881ee4cc94439c8faca222ed0ee771d31ca73ea2 100644
--- a/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
+++ b/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
@@ -45,7 +45,6 @@ public class LoginPage extends DomiSMPPage {
             }
         } catch (Exception e) {
             LOG.debug("Password expiration popup is not present");
-            throw new RuntimeException("Password expiration popup is not present", e);
         }
 
 
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
index e01db86f744405a79c0db5bdceb9081e427146db..cd3c6d203c11407aabca8d9f17220b344a02720c 100644
--- a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
+++ b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
@@ -149,7 +149,6 @@ public class ProfilePgTests extends SeleniumTest {
         String oldLastSet = profilePage.profileData.getLastSetValue();
         String oldPasswordExpiresOn = profilePage.profileData.getPasswordExpiresOnValue();
 
-        //profilePage.profileData.setChangePasswordBtn.click();
         String newPass = "Edeltest!23456789Edelt" + Generator.randomAlphaNumericValue(4);
         SetChangePasswordDialog setChangePasswordDialog = profilePage.profileData.clickOnChangePassword();
         setChangePasswordDialog.fillChangePassword(data.getNewPassword(), newPass);