diff --git a/src/user/UserCredentials.tsx b/src/user/UserCredentials.tsx
index 188f1760d6..a85104e6eb 100644
--- a/src/user/UserCredentials.tsx
+++ b/src/user/UserCredentials.tsx
@@ -24,11 +24,12 @@ import type CredentialRepresentation from "@keycloak/keycloak-admin-client/lib/d
 import { ResetPasswordDialog } from "./user-credentials/ResetPasswordDialog";
 import { ResetCredentialDialog } from "./user-credentials/ResetCredentialDialog";
 import { InlineLabelEdit } from "./user-credentials/InlineLabelEdit";
-import "./user-credentials.css";
 import styles from "@patternfly/react-styles/css/components/Table/table";
 import { CredentialRow } from "./user-credentials/CredentialRow";
 import { toUpperCase } from "../util";
 
+import "./user-credentials.css";
+
 type UserCredentialsProps = {
   user: UserRepresentation;
 };
@@ -394,12 +395,15 @@ export const UserCredentials = ({ user }: UserCredentialsProps) => {
                 <Fragment key={groupedCredential.key}>
                   <Tr
                     id={groupedCredential.value.map(({ id }) => id).toString()}
-                    draggable
+                    draggable={groupedUserCredentials.length > 1}
                     onDrop={onDrop}
                     onDragEnd={onDragEnd}
                     onDragStart={onDragStart}
                   >
                     <Td
+                      className={
+                        groupedUserCredentials.length === 1 ? "one-row" : ""
+                      }
                       draggableRow={{
                         id: `draggable-row-${groupedCredential.value.map(
                           ({ id }) => id
diff --git a/src/user/messages.ts b/src/user/messages.ts
index a7005676a3..ce3c537fb5 100644
--- a/src/user/messages.ts
+++ b/src/user/messages.ts
@@ -124,6 +124,7 @@ export default {
       "This user does not have any credentials. You can set password for this user.",
     setPassword: "Set password",
     setPasswordFor: "Set password for {{username}}",
+    defaultPasswordLabel: "My password",
     save: "Save",
     cancel: "Cancel",
     savePasswordSuccess: "The password has been set successfully.",
diff --git a/src/user/user-credentials.css b/src/user/user-credentials.css
index 672ec77ce8..0e6c2207e0 100644
--- a/src/user/user-credentials.css
+++ b/src/user/user-credentials.css
@@ -75,4 +75,8 @@
 
 tr.kc-table-header th {
   padding-top: 0px !important;
+}
+
+td.one-row button svg {
+  color: var(--pf-c-button--disabled--Color);
 }
\ No newline at end of file
diff --git a/src/user/user-credentials/CredentialRow.tsx b/src/user/user-credentials/CredentialRow.tsx
index c957a7874a..b1d2cd76e2 100644
--- a/src/user/user-credentials/CredentialRow.tsx
+++ b/src/user/user-credentials/CredentialRow.tsx
@@ -77,7 +77,7 @@ export const CredentialRow = ({
         </Button>
       </Td>
       {credential.type === "password" ? (
-        <Td>
+        <Td isActionCell>
           <Button
             variant="secondary"
             data-testid="resetPasswordBtn"
@@ -89,7 +89,7 @@ export const CredentialRow = ({
       ) : (
         <Td />
       )}
-      <Td>
+      <Td isActionCell>
         <Dropdown
           isPlain
           position={DropdownPosition.right}
diff --git a/src/user/user-credentials/InlineLabelEdit.tsx b/src/user/user-credentials/InlineLabelEdit.tsx
index 5d6dba972d..24d28d9d7e 100644
--- a/src/user/user-credentials/InlineLabelEdit.tsx
+++ b/src/user/user-credentials/InlineLabelEdit.tsx
@@ -54,7 +54,11 @@ export const InlineLabelEdit = ({
   };
 
   return (
-    <Form isHorizontal className="kc-form-userLabel">
+    <Form
+      isHorizontal
+      className="kc-form-userLabel"
+      onSubmit={handleSubmit(saveUserLabel)}
+    >
       <FormGroup fieldId="kc-userLabel" className="kc-userLabel-row">
         <div className="kc-form-group-userLabel">
           {isEditable ? (
@@ -73,9 +77,7 @@ export const InlineLabelEdit = ({
                   data-testid="editUserLabelAcceptBtn"
                   variant="link"
                   className="kc-editUserLabelAcceptBtn"
-                  onClick={() => {
-                    handleSubmit(saveUserLabel)();
-                  }}
+                  type="submit"
                   icon={<CheckIcon />}
                 />
                 <Button
diff --git a/src/user/user-credentials/ResetPasswordDialog.tsx b/src/user/user-credentials/ResetPasswordDialog.tsx
index 0ccb2b6118..bf066f04e9 100644
--- a/src/user/user-credentials/ResetPasswordDialog.tsx
+++ b/src/user/user-credentials/ResetPasswordDialog.tsx
@@ -93,6 +93,16 @@ export const ResetPasswordDialog = ({
           value: password,
         },
       });
+      const { id } = (
+        await adminClient.users.getCredentials({ id: user.id! })
+      ).find((c) => c.type === "password")!;
+      await adminClient.users.updateCredentialLabel(
+        {
+          id: user.id!,
+          credentialId: id!,
+        },
+        t("defaultPasswordLabel")
+      );
       addAlert(
         isResetPassword
           ? t("resetCredentialsSuccess")