diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
index 73443f1282..71381f07c5 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
@@ -127,7 +127,8 @@ public class PasswordCredentials {
 
    protected ToStringHelper string() {
       return Objects.toStringHelper(this)
-            .add("username", username).add("password", password);
+            .add("username", username)
+            .add("password", password == null ? null : "*****");
    }
 
    @Override