diff --git a/tripleoclient/v1/undercloud.py b/tripleoclient/v1/undercloud.py
index 41674049e..53249db71 100644
--- a/tripleoclient/v1/undercloud.py
+++ b/tripleoclient/v1/undercloud.py
@@ -17,6 +17,7 @@
 
 import argparse
 import logging
+import os
 import subprocess
 
 from openstackclient.i18n import _
@@ -145,7 +146,10 @@ class InstallUndercloud(command.Command):
             try:
                 subprocess.check_call(cmd)
                 self.log.warning(UNDERCLOUD_COMPLETION_MESSAGE.format(
-                    '~/undercloud-passwords.conf',
+                    os.path.join(
+                        constants.UNDERCLOUD_OUTPUT_DIR,
+                        'undercloud-passwords.conf'
+                    ),
                     '~/stackrc'
                     ))
             except Exception as e:
@@ -183,7 +187,10 @@ class UpgradeUndercloud(InstallUndercloud):
                 subprocess.check_call(cmd)
                 self.log.warning(
                     UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
-                        '~/undercloud-passwords.conf',
+                        os.path.join(
+                            constants.UNDERCLOUD_OUTPUT_DIR,
+                            'undercloud-passwords.conf'
+                        ),
                         '~/stackrc'))
             except Exception as e:
                 self.log.error(UNDERCLOUD_FAILURE_MESSAGE)
diff --git a/tripleoclient/v1/undercloud_preflight.py b/tripleoclient/v1/undercloud_preflight.py
index 04805a79a..52333b895 100644
--- a/tripleoclient/v1/undercloud_preflight.py
+++ b/tripleoclient/v1/undercloud_preflight.py
@@ -39,8 +39,10 @@ CONF = cfg.CONF
 # We need 8 GB, leave a little room for variation in what 8 GB means on
 # different platforms.
 REQUIRED_MB = 7680
-PASSWORD_PATH = '%s/%s' % (constants.UNDERCLOUD_OUTPUT_DIR,
-                           'undercloud-passwords.conf')
+PASSWORD_PATH = os.path.join(
+    constants.UNDERCLOUD_OUTPUT_DIR,
+    'undercloud-passwords.conf'
+)
 
 LOG = logging.getLogger(__name__ + ".UndercloudSetup")