diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
index 5b1bf641683..265933ee823 100644
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
@@ -1314,6 +1314,12 @@ def load_passwords(self):
             pki.util.load_properties(self.password_conf, self.passwords)
 
     def store_passwords(self):
+
+        if os.path.exists(self.password_conf):
+            logger.info('Updating %s', self.password_conf)
+        else:
+            logger.info('Creating %s', self.password_conf)
+
         self.store_properties(self.password_conf, self.passwords)
 
     def remove_passwords(self, force=False):
diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
index 14d5ad705aa..3fdbadbcec7 100644
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -187,7 +187,6 @@ def spawn(self, deployer):
             logger.info('Generating random replication manager password')
             instance.passwords['replicationdb'] = pki.generate_password()
 
-        logger.info('Creating %s', instance.password_conf)
         instance.store_passwords()
 
         deployer.create_server_nssdb()