diff --git a/frontend/src/pages/UserManagerPage.jsx b/frontend/src/pages/UserManagerPage.jsx
index 1e57455..33ac1c7 100644
--- a/frontend/src/pages/UserManagerPage.jsx
+++ b/frontend/src/pages/UserManagerPage.jsx
@@ -319,8 +319,8 @@ function UserForm({ user, userPass, allUserGroups, onDone, onCancel, isMobile, o
       <div style={{ marginBottom:16 }}>
         {lbl('Password',
           isEdit && pwEnabled,
-          isEdit && !pwEnabled ? '(not changing — click Reset Password to set a new one)' :
-          !isEdit ? `(optional — blank uses system default)` : null
+          isEdit && !pwEnabled ? '(click Reset button to change)' :
+          !isEdit ? <>(optional — blank uses <strong>{userPass}</strong> as default)</> : null
         )}
         <div style={{ opacity: pwEnabled ? 1 : 0.55 }}>
           <PasswordInput
@@ -657,6 +657,7 @@ export default function UserManagerPage({ isMobile = false, onProfile, onHelp, o
           {isFormView && (
             <div style={{ flex:1, overflowY:'auto', padding:16, paddingBottom: isMobile ? 'calc(82px + env(safe-area-inset-bottom, 0px))' : 16, overscrollBehavior:'contain' }}>
               <UserForm
+                key={view === 'edit' ? editUser?.id : 'new'}
                 user={view === 'edit' ? editUser : null}
                 userPass={userPass}
                 allUserGroups={allUserGroups}