diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.html b/apps/browser/src/vault/popup/components/vault/add-edit.component.html
index 7aeddba7d2..a14c7dae28 100644
--- a/apps/browser/src/vault/popup/components/vault/add-edit.component.html
+++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.html
@@ -70,18 +70,15 @@
             <div class="row-main">
               <label for="loginPassword">{{ "password" | i18n }}</label>
               <input
-                *ngIf="showPassword"
                 id="loginPassword"
                 class="monospaced"
-                type="text"
+                type="{{ showPassword ? 'text' : 'password' }}"
                 name="Login.Password"
                 [(ngModel)]="cipher.login.password"
                 appInputVerbatim
+                [disabled]="!cipher.viewPassword"
                 [readonly]="!cipher.edit && editMode"
               />
-              <div *ngIf="!showPassword" class="monospaced">
-                {{ cipher.login.maskedPassword || "••••••••" }}
-              </div>
             </div>
             <div class="action-buttons">
               <button
@@ -153,18 +150,15 @@
             <div class="row-main">
               <label for="loginTotp">{{ "authenticatorKeyTotp" | i18n }}</label>
               <input
-                *ngIf="showTotpSeed"
                 id="loginTotp"
-                type="text"
+                type="{{ showTotpSeed ? 'text' : 'password' }}"
                 name="Login.Totp"
                 class="monospaced"
                 [(ngModel)]="cipher.login.totp"
                 appInputVerbatim
+                [disabled]="!cipher.viewPassword"
                 [readonly]="!cipher.edit && editMode"
               />
-              <div *ngIf="!showTotpSeed" class="monospaced">
-                {{ cipher.login.maskedPassword || "••••••••" }}
-              </div>
             </div>
             <div class="action-buttons">
               <button
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index 1b625d0236..2c216ad5ca 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -226,8 +226,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
     if (!this.allowPersonal && this.organizationId == undefined) {
       this.organizationId = this.defaultOwnerId;
     }
-
-    this.resetMaskState();
   }
 
   async load() {
@@ -274,8 +272,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
         this.cipher.secureNote.type = SecureNoteType.Generic;
         this.cipher.reprompt = CipherRepromptType.None;
       }
-
-      this.resetMaskState();
     }
 
     if (this.cipher != null && (!this.editMode || loadedAddEditCipherInfo || this.cloneMode)) {
@@ -517,12 +513,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
     return true;
   }
 
-  resetMaskState() {
-    // toggle masks off for maskable login properties with no value on init/load
-    this.showTotpSeed = !this.cipher?.login?.totp;
-    this.showPassword = !this.cipher?.login?.password;
-  }
-
   togglePassword() {
     this.showPassword = !this.showPassword;