diff --git a/src/app/screens/Accounts/Detail/index.tsx b/src/app/screens/Accounts/Detail/index.tsx
index 5d27c8a996..d082850c35 100644
--- a/src/app/screens/Accounts/Detail/index.tsx
+++ b/src/app/screens/Accounts/Detail/index.tsx
@@ -193,7 +193,6 @@ function AccountDetail() {
                   id="name"
                   label={t("name.title")}
                   placeholder={t("name.placeholder")}
-                  type="text"
                   value={accountName}
                   onChange={(event) => {
                     setAccountName(event.target.value);
@@ -294,7 +293,6 @@ function AccountDetail() {
                             <TextField
                               id="uri"
                               label={t("export.export_uri")}
-                              type="text"
                               readOnly
                               value={`lndhub://${lndHubData.login}:${lndHubData.password}@${lndHubData.url}/`}
                             />
@@ -389,7 +387,6 @@ function AccountDetail() {
                 <TextField
                   id="nostrPublicKey"
                   label={t("nostr.public_key.label")}
-                  type="text"
                   value={nostrPublicKey}
                   disabled
                   endAdornment={
diff --git a/src/app/screens/Accounts/NostrSettings/index.tsx b/src/app/screens/Accounts/NostrSettings/index.tsx
index 35456b4e62..11bee3dd2d 100644
--- a/src/app/screens/Accounts/NostrSettings/index.tsx
+++ b/src/app/screens/Accounts/NostrSettings/index.tsx
@@ -166,6 +166,7 @@ function NostrSettings() {
               <TextField
                 id="nostrPrivateKey"
                 label={t("nostr.private_key.label")}
+                autoComplete="new-password"
                 type={nostrPrivateKeyVisible ? "text" : "password"}
                 value={nostrPrivateKey}
                 onChange={(event) => {
@@ -197,7 +198,6 @@ function NostrSettings() {
               <TextField
                 id="nostrPublicKey"
                 label={t("nostr.public_key.label")}
-                type="text"
                 value={nostrPublicKey}
                 disabled
                 endAdornment={<InputCopyButton value={nostrPublicKey} />}
diff --git a/src/app/screens/Settings/index.tsx b/src/app/screens/Settings/index.tsx
index 44f3ffa4fa..b0bbfefb52 100644
--- a/src/app/screens/Settings/index.tsx
+++ b/src/app/screens/Settings/index.tsx
@@ -264,7 +264,6 @@ function Settings() {
             <div className="w-64">
               <Input
                 placeholder={t("name.placeholder")}
-                type="text"
                 value={settings.userName}
                 onChange={(event) => {
                   saveSetting({
diff --git a/src/app/screens/connectors/ConnectCitadel/index.tsx b/src/app/screens/connectors/ConnectCitadel/index.tsx
index 92b8fb2534..aa8a3799ff 100644
--- a/src/app/screens/connectors/ConnectCitadel/index.tsx
+++ b/src/app/screens/connectors/ConnectCitadel/index.tsx
@@ -115,6 +115,7 @@ export default function ConnectCitadel() {
         <TextField
           label={t("password.label")}
           id="password"
+          autoComplete="new-password"
           type={passwordView ? "text" : "password"}
           autoFocus={true}
           required
@@ -138,7 +139,6 @@ export default function ConnectCitadel() {
         label={t("url.label")}
         id="url"
         placeholder={t("url.placeholder")}
-        type="text"
         value={formData.url}
         required
         onChange={handleChange}
diff --git a/src/app/screens/connectors/ConnectCommando/index.tsx b/src/app/screens/connectors/ConnectCommando/index.tsx
index 5c0820bdd8..1b0fb2c11f 100644
--- a/src/app/screens/connectors/ConnectCommando/index.tsx
+++ b/src/app/screens/connectors/ConnectCommando/index.tsx
@@ -114,7 +114,6 @@ export default function ConnectCommando() {
         <TextField
           id="host"
           label={t("host.label")}
-          type="text"
           required
           placeholder="0.0.0.0"
           title="host"
@@ -127,7 +126,6 @@ export default function ConnectCommando() {
         <TextField
           id="pubkey"
           label={t("pubkey.label")}
-          type="text"
           required
           placeholder="02...."
           title="pubkey"
@@ -139,7 +137,6 @@ export default function ConnectCommando() {
         <TextField
           id="rune"
           label={t("rune.label")}
-          type="text"
           required
           placeholder=""
           title="rune"
@@ -170,7 +167,6 @@ export default function ConnectCommando() {
             <TextField
               id="proxy"
               label={t("proxy.label")}
-              type="text"
               placeholder="proxy"
               required
               title="proxy"
@@ -182,6 +178,7 @@ export default function ConnectCommando() {
             id="commandoPrivateKey"
             label={t("privKey.label")}
             type={commandoPrivateKeyVisible ? "text" : "password"}
+            autoComplete="new-password"
             value={formData.privateKey}
             endAdornment={
               <button
diff --git a/src/app/screens/connectors/ConnectEclair/index.tsx b/src/app/screens/connectors/ConnectEclair/index.tsx
index 4db268ff33..6fa0811815 100644
--- a/src/app/screens/connectors/ConnectEclair/index.tsx
+++ b/src/app/screens/connectors/ConnectEclair/index.tsx
@@ -98,6 +98,7 @@ export default function ConnectEclair() {
       <div className="mb-6">
         <TextField
           id="password"
+          autoComplete="new-password"
           label={t("password.label")}
           type={passwordView ? "text" : "password"}
           required
@@ -121,7 +122,6 @@ export default function ConnectEclair() {
       <TextField
         id="url"
         label={t("url.label")}
-        type="text"
         placeholder={t("url.placeholder")}
         value={formData.url}
         required
diff --git a/src/app/screens/connectors/ConnectGaloy/index.tsx b/src/app/screens/connectors/ConnectGaloy/index.tsx
index fe11b682a7..c489d77852 100644
--- a/src/app/screens/connectors/ConnectGaloy/index.tsx
+++ b/src/app/screens/connectors/ConnectGaloy/index.tsx
@@ -197,7 +197,6 @@ export default function ConnectGaloy(props: Props) {
             <Input
               id="jwt"
               name="jwt"
-              type="text"
               required
               onChange={handleJwtChange}
               autoFocus={true}
diff --git a/src/app/screens/connectors/ConnectKollider/index.tsx b/src/app/screens/connectors/ConnectKollider/index.tsx
index 56a435e8f0..0917dc2e36 100644
--- a/src/app/screens/connectors/ConnectKollider/index.tsx
+++ b/src/app/screens/connectors/ConnectKollider/index.tsx
@@ -176,7 +176,6 @@ export default function ConnectKollidier({ variant }: Props) {
         <TextField
           id="username"
           label={t(`username.label`)}
-          type="text"
           required
           value={formData.username}
           onChange={handleChange}
diff --git a/src/app/screens/connectors/ConnectLnbits/index.tsx b/src/app/screens/connectors/ConnectLnbits/index.tsx
index d31a10a48d..bfb4840896 100644
--- a/src/app/screens/connectors/ConnectLnbits/index.tsx
+++ b/src/app/screens/connectors/ConnectLnbits/index.tsx
@@ -109,7 +109,6 @@ export default function ConnectLnbits() {
           id="adminkey"
           label={t("admin_key.label")}
           placeholder={t("admin_key.placeholder")}
-          type="text"
           required
           onChange={handleChange}
           autoFocus={true}
@@ -118,7 +117,6 @@ export default function ConnectLnbits() {
       <TextField
         id="url"
         label={t("url.label")}
-        type="text"
         value={formData.url}
         required
         onChange={handleChange}
diff --git a/src/app/screens/connectors/ConnectLnc/index.tsx b/src/app/screens/connectors/ConnectLnc/index.tsx
index fd4f180c0e..4d1b0446de 100644
--- a/src/app/screens/connectors/ConnectLnc/index.tsx
+++ b/src/app/screens/connectors/ConnectLnc/index.tsx
@@ -92,6 +92,7 @@ export default function ConnectLnd() {
       <div className="mt-6">
         <TextField
           id="pairingPhrase"
+          autoComplete="new-password"
           type="password"
           label={t("pairing_phrase.label")}
           placeholder={t("pairing_phrase.placeholder")}
diff --git a/src/app/screens/connectors/ConnectLnd/index.tsx b/src/app/screens/connectors/ConnectLnd/index.tsx
index 1523aa32fd..2228f92a3a 100644
--- a/src/app/screens/connectors/ConnectLnd/index.tsx
+++ b/src/app/screens/connectors/ConnectLnd/index.tsx
@@ -175,6 +175,8 @@ export default function ConnectLnd() {
         <div>
           <TextField
             id="macaroon"
+            type="password"
+            autoComplete="new-password"
             label={t("macaroon.label")}
             value={formData.macaroon}
             onChange={handleChange}
diff --git a/src/app/screens/connectors/ConnectLndHub/index.tsx b/src/app/screens/connectors/ConnectLndHub/index.tsx
index 6de4082f16..90ced709a1 100644
--- a/src/app/screens/connectors/ConnectLndHub/index.tsx
+++ b/src/app/screens/connectors/ConnectLndHub/index.tsx
@@ -118,7 +118,6 @@ export default function ConnectLndHub({
         <TextField
           id="uri"
           label={t("uri.label")}
-          type="text"
           required
           placeholder="lndhub://..."
           pattern="lndhub://.+"
diff --git a/src/app/screens/connectors/ConnectMyNode/index.tsx b/src/app/screens/connectors/ConnectMyNode/index.tsx
index 067ff9ee30..26d9345698 100644
--- a/src/app/screens/connectors/ConnectMyNode/index.tsx
+++ b/src/app/screens/connectors/ConnectMyNode/index.tsx
@@ -134,6 +134,8 @@ export default function ConnectMyNode() {
         <TextField
           id="lndconnect"
           label={t("rest_url.label")}
+          type="password"
+          autoComplete="new-password"
           placeholder={t("rest_url.placeholder")}
           onChange={handleLndconnectUrl}
           required
diff --git a/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx b/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
index c0e2d745a5..31f062463f 100644
--- a/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
+++ b/src/app/screens/connectors/ConnectRaspiBlitz/index.tsx
@@ -164,6 +164,8 @@ export default function ConnectRaspiBlitz() {
         <div>
           <TextField
             id="macaroon"
+            type="password"
+            autoComplete="new-password"
             label="Macaroon (HEX format)"
             value={formData.macaroon}
             onChange={handleMacaroon}
diff --git a/src/app/screens/connectors/ConnectStart9/index.tsx b/src/app/screens/connectors/ConnectStart9/index.tsx
index ac5578baab..2df92ccc01 100644
--- a/src/app/screens/connectors/ConnectStart9/index.tsx
+++ b/src/app/screens/connectors/ConnectStart9/index.tsx
@@ -136,6 +136,8 @@ export default function ConnectStart9() {
       <div className="mt-6">
         <TextField
           id="lndconnect"
+          type="password"
+          autoComplete="new-password"
           label={t("rest_url.label")}
           placeholder={t("rest_url.placeholder")}
           onChange={handleLndconnectUrl}
diff --git a/src/app/screens/connectors/ConnectUmbrel/index.tsx b/src/app/screens/connectors/ConnectUmbrel/index.tsx
index 5b0e124d17..b5cd04a4dc 100644
--- a/src/app/screens/connectors/ConnectUmbrel/index.tsx
+++ b/src/app/screens/connectors/ConnectUmbrel/index.tsx
@@ -133,6 +133,8 @@ export default function ConnectUmbrel() {
       <div className="mt-6">
         <TextField
           id="lndconnect"
+          type="password"
+          autoComplete="new-password"
           label={t("rest_url.label")}
           placeholder={t("rest_url.placeholder")}
           onChange={handleLndconnectUrl}