diff --git a/ui/src/user/AddEditUserDialog.tsx b/ui/src/user/AddEditUserDialog.tsx
index fb85d09..731fabf 100644
--- a/ui/src/user/AddEditUserDialog.tsx
+++ b/ui/src/user/AddEditUserDialog.tsx
@@ -53,7 +53,7 @@ export default class AddEditDialog extends Component<IProps, IState> {
                         autoFocus
                         margin="dense"
                         className="name"
-                        label="Name *"
+                        label="Username *"
                         value={name}
                         name="username"
                         id="username"
@@ -66,7 +66,7 @@ export default class AddEditDialog extends Component<IProps, IState> {
                         type="password"
                         value={pass}
                         fullWidth
-                        label={isEdit ? 'Pass (empty if no change)' : 'Pass *'}
+                        label={isEdit ? 'Password (empty if no change)' : 'Password *'}
                         name="password"
                         id="password"
                         onChange={this.handleChange.bind(this, 'pass')}
@@ -92,7 +92,7 @@ export default class AddEditDialog extends Component<IProps, IState> {
                                 ? passPresent
                                     ? ''
                                     : 'password is required'
-                                : 'name is required'
+                                : 'username is required'
                         }>
                         <div>
                             <Button