diff --git a/ipa-server/ipa-gui/ipagui/templates/useredit.kid b/ipa-server/ipa-gui/ipagui/templates/useredit.kid
index f5cb1b02e..a3d813339 100644
--- a/ipa-server/ipa-gui/ipagui/templates/useredit.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/useredit.kid
@@ -29,10 +29,10 @@ else:
 ?>
 
     <div py:if='pw_expires_soon' class="warning_message">
-        Password will expire in ${pw_expires_days} day${days_suffix}
+        ${user.get("uid")}'s password will expire in ${pw_expires_days} day${days_suffix}
     </div>
     <div py:if='pw_is_expired' class="warning_message">
-        Password has expired
+        ${user.get("uid")}'s password has expired
     </div>
 
      ${form.display(action=tg.url('/user/update'), value=user, user_groups=user_groups)}
diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
index 8cc356b89..614988729 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
@@ -28,10 +28,10 @@ else:
 ?>
 
     <div id="alertbox" py:if='pw_expires_soon' class="warning_message">
-        Password will expire in ${pw_expires_days} day${days_suffix}
+        ${user.get("uid")}'s password will expire in ${pw_expires_days} day${days_suffix}
     </div>
     <div id="alertbox" py:if='pw_is_expired' class="warning_message">
-        Password has expired
+        ${user.get("uid")}'s password has expired
     </div>
 
     <h2 class="formsection">Identity Details</h2>