diff --git a/src/main/java/org/appng/application/manager/business/Properties.java b/src/main/java/org/appng/application/manager/business/Properties.java
index b1074ea..acdaccf 100644
--- a/src/main/java/org/appng/application/manager/business/Properties.java
+++ b/src/main/java/org/appng/application/manager/business/Properties.java
@@ -160,7 +160,7 @@ public class PropertyWrapper extends PropertyImpl {
 		}
 
 		public String getDisplayValue() {
-			if(Property.Type.MULTILINE.equals(getType())) {
+			if (Property.Type.MULTILINE.equals(getType())) {
 				return getClob();
 			}
 			return getActualString();
@@ -168,10 +168,12 @@ public String getDisplayValue() {
 
 		@Override
 		public String getActualString() {
+			String stringValue = getString();
 			if (hidePassword && Property.Type.PASSWORD.equals(getType())) {
-				return getString().replaceAll("\\.", "*");
+				return stringValue.substring(0, 2) + StringUtils.repeat('*', stringValue.length() - 4)
+						+ stringValue.substring(stringValue.length() - 2);
 			}
-			return getString();
+			return stringValue;
 		}
 
 		@Override
diff --git a/src/main/java/org/appng/application/manager/form/PropertyForm.java b/src/main/java/org/appng/application/manager/form/PropertyForm.java
index e282fe9..51affbd 100644
--- a/src/main/java/org/appng/application/manager/form/PropertyForm.java
+++ b/src/main/java/org/appng/application/manager/form/PropertyForm.java
@@ -75,8 +75,8 @@ public void validate(Site site, Application application, Environment environment
 		}
 		if (Property.Type.BOOLEAN.equals(getProperty().getType())) {
 			String stringValue = getProperty().getString();
-			boolean value = stringValue.equalsIgnoreCase("on") || stringValue.equalsIgnoreCase("true");
-			getProperty().setValue(value);
+			boolean selected = StringUtils.equalsAnyIgnoreCase(stringValue, "on", "true");
+			getProperty().setValue(selected);
 		}
 	}