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 acdaccf..f8180b1 100644
--- a/src/main/java/org/appng/application/manager/business/Properties.java
+++ b/src/main/java/org/appng/application/manager/business/Properties.java
@@ -169,7 +169,7 @@ public String getDisplayValue() {
 		@Override
 		public String getActualString() {
 			String stringValue = getString();
-			if (hidePassword && Property.Type.PASSWORD.equals(getType())) {
+			if (StringUtils.isNotBlank(stringValue) && hidePassword && Property.Type.PASSWORD.equals(getType())) {
 				return stringValue.substring(0, 2) + StringUtils.repeat('*', stringValue.length() - 4)
 						+ stringValue.substring(stringValue.length() - 2);
 			}