diff --git a/source/usermanager.pas b/source/usermanager.pas
index 823faccc..1146c8a8 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -588,7 +588,9 @@ procedure TUserManagerForm.editPasswordRightButtonClick(Sender: TObject);
 begin
   // Auto generate a random password, display it for a second and copy it to clipboard
   Screen.Cursor := crHourglass;
+  editPassword.SetFocus;
   editPassword.Text := GeneratePassword(8);
+  editPassword.Modified := True;
   editPassword.PasswordChar := #0;
   editPassword.Repaint;
   Sleep(1000);