diff --git a/functional-test/src/main/java/org/zanata/page/CorePage.java b/functional-test/src/main/java/org/zanata/page/CorePage.java
index 209903de42..4c8d6ccc88 100644
--- a/functional-test/src/main/java/org/zanata/page/CorePage.java
+++ b/functional-test/src/main/java/org/zanata/page/CorePage.java
@@ -131,7 +131,8 @@ public List<String> expectError(final String expected) {
         waitForAMoment().withMessage(msg).until(new Predicate<WebDriver>() {
             @Override
             public boolean apply(WebDriver input) {
-                return getErrors().contains(expected);
+                List<String> errors = getErrors();
+                return errors.contains(expected);
             }
         });
         return getErrors();
@@ -139,8 +140,8 @@ public boolean apply(WebDriver input) {
 
     public String getNotificationMessage() {
         log.info("Query notification message");
-        List<WebElement> messages = waitForElementExists(By.id("messages"))
-                        .findElements(By.tagName("li"));
+        List<WebElement>messages = (List<WebElement>) getExecutor()
+                .executeScript("return $('#messages li')");
         return messages.size() > 0 ? messages.get(0).getText() : "";
     }
 
diff --git a/zanata-war/src/main/resources/ValidationMessages.properties b/zanata-war/src/main/resources/ValidationMessages.properties
index 708feaae38..74df900aba 100644
--- a/zanata-war/src/main/resources/ValidationMessages.properties
+++ b/zanata-war/src/main/resources/ValidationMessages.properties
@@ -15,6 +15,7 @@ javax.validation.constraints.Url.message=must be a valid URL
 #javax.validation.constraints.UrlNoSlash.message=must be a valid URL (without final slash)
 javax.validation.constraints.NotDuplicateEmail.message=duplicate email
 javax.validation.constraints.EmailList.message=invalid email or incorrect comma placement
+org.hibernate.validator.constraints.NotEmpty.message=may not be empty
 org.jboss.seam.captcha.error=incorrect response
 
 validation.username.constraints=Between 3 and 20 lowercase letters, numbers and underscores only