diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/StringListEditorCompositePO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/StringListEditorCompositePO.java
index 59c247b8112..3e332171fea 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/StringListEditorCompositePO.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/StringListEditorCompositePO.java
@@ -47,11 +47,11 @@ public class StringListEditorCompositePO extends PageArea {
         return new GenericCellTablePO<>(this.driver, this.valueGrid, ValueEntryPO.class);
     }
 
-    public ValueEntryPO findValue(final String permission) {
+    public ValueEntryPO findValue(final String valueToFind) {
         final CellTablePO<ValueEntryPO> table = getExpandedValuesGrid();
         for (ValueEntryPO entry : table.getEntries()) {
             final String name = entry.getValueEntryName();
-            if (name != null) {
+            if (name != null && name.equals(valueToFind)) {
                 return entry;
             }
         }
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/TextBoxBasePO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/TextBoxBasePO.java
index d355e4e74cc..5c4844bb88f 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/TextBoxBasePO.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/TextBoxBasePO.java
@@ -75,13 +75,13 @@ public abstract class TextBoxBasePO extends AbstractInputPO {
     }
     
     /**
-     * Gets the text contained in the underlying {@link WebElement}s "Value" attribute.
+     * Gets the text contained in the underlying {@link WebElement}s "value" attribute.
      * This might be necessary for input elements that do not maintain their contained text in the "innerText" attribute, that is returned by #WebElement#getText()
      * @return the contained text
      * 
      */
     public String getValue() {
-        return getWebElement().getAttribute("Value");
+        return getWebElement().getAttribute("value");
     }
 
 }