Please cherry-pick:

[addressbook-core.git] / src / org / mxchange / addressbook / database / BaseAddressbookDatabaseBean.java

diff --git a/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
index 57b8abce7e5ec2bf2c1e78442ee725b9655cb052..1664575ee780f4d1584370bc8df05129d58eff71 100644 (file)
--- a/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
+++ b/src/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
@@ -501,7 +501,12 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean {
 
                // Set base URL and random password
                variables.put("baseUrl", baseUrl); //NOI18N
-               variables.put("randomPassword", randomPassword); //NOI18N
+               variables.put("randomPassword", ""); //NOI18N
+
+               // Is the random password set?
+               if ((randomPassword instanceof String) && (!randomPassword.isEmpty())) {
+                       variables.put("randomPassword", randomPassword); //NOI18N
+               }
 
                // Set all
                // @TODO Language from message bundle