diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
index d21aeb4153e..6c128eb93a4 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
@@ -509,7 +509,14 @@ export const addUser = (username, email) => {
     .should('exist')
     .should('be.visible')
     .type('Adding user');
+  interceptURL('GET', ' /api/v1/users/generateRandomPwd', 'generatePassword');
+  cy.get('[data-testid="password-generator"]')
+    .should('be.visible')
+    .click();
+  verifyResponseStatusCode('@generatePassword', 200);
+  interceptURL('POST', ' /api/v1/users', 'add-user');
   cy.get('[data-testid="save-user"]').scrollIntoView().click();
+  verifyResponseStatusCode('@add-user', 201);
 };
 
 export const softDeleteUser = (username) => {
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Bots.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Bots.spec.js
index 221c5222cd8..c3a4579b08e 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Bots.spec.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Bots.spec.js
@@ -65,8 +65,14 @@ describe('Bots Page should work properly', () => {
     cy.get('[data-testid="displayName"]').should('exist').type(botName);
     //Enter description
     cy.get(descriptionBox).type(description);
-    interceptURL('POST', '/api/v1/bots', 'createBot');
+    //Generate Password
+    interceptURL('GET', ' /api/v1/users/generateRandomPwd', 'generatePassword');
+    cy.get('[data-testid="password-generator"]')
+    .should('be.visible')
+    .click();
+  verifyResponseStatusCode('@generatePassword', 200);
     //Click on save button
+    interceptURL('POST', '/api/v1/bots', 'createBot');
     cy.get('[data-testid="save-user"]')
       .scrollIntoView()
       .should('be.visible')
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.js
index 8eba3df93d3..c7048d33a40 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.js
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { addUser, deleteSoftDeletedUser, login, restoreUser, softDeleteUser, uuid } from '../../common/common';
+import { addUser, deleteSoftDeletedUser, interceptURL, login, restoreUser, softDeleteUser, uuid, verifyResponseStatusCode } from '../../common/common';
 import { LOGIN } from '../../constants/constants';
 
 const userName = `Usercttest${uuid()}`;
@@ -29,6 +29,7 @@ describe('Users flow should work properly', () => {
       .should('exist')
       .should('be.visible')
       .click();
+    interceptURL('GET', '/api/v1/users?fields=profile,teams,roles&&isBot=false&limit=15', 'getUsers');
     cy.get('.ant-menu-title-content')
       .contains('Users')
       .should('exist')
@@ -41,6 +42,7 @@ describe('Users flow should work properly', () => {
     cy.get('.ant-btn').contains('Add User').click();
 
     addUser(userName, userEmail);
+    verifyResponseStatusCode('@getUsers', 200);
 
     //Validate if user is added in the User tab
 
@@ -74,6 +76,7 @@ describe('Admin flow should work properly', () => {
       .should('exist')
       .should('be.visible')
       .click();
+      interceptURL('GET', '/api/v1/users?fields=profile,teams,roles&&isAdmin=true&isBot=false&limit=15', 'getAdmins');
     cy.get('.ant-menu-title-content')
       .contains('Admins')
       .should('exist')
@@ -93,6 +96,7 @@ describe('Admin flow should work properly', () => {
       .click();
 
     addUser(adminName, adminEmail);
+    verifyResponseStatusCode('@getAdmins', 200);
 
     //Validate if user is added in the User tab
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
index 6daee899300..58af634cc17 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx
@@ -842,6 +842,7 @@ const CreateUser = ({
                     <div className="flex-center w-16">
                       <div
                         className="w-8 h-7 flex-center cursor-pointer"
+                        data-testid="password-generator"
                         onClick={generateRandomPassword}>
                         {isPasswordGenerating ? (
                           <Loader size="small" type="default" />