diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 546906fc946..efb31e6b55a 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -28,9 +28,9 @@
                                 <label for="loginPassword">{{'password' | i18n}}</label>
                                 <input id="loginPassword" class="monospaced"
                                     type="{{showPassword ? 'text' : 'password'}}" name="Login.Password"
-                                    [(ngModel)]="cipher.login.password">
+                                    [(ngModel)]="cipher.login.password" [disabled]="!cipher.viewPassword">
                             </div>
-                            <div class="action-buttons">
+                            <div class="action-buttons" *ngIf=cipher.viewPassword>
                                 <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
                                     appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
                                     [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 7a105300139..c8bbed8d309 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -166,7 +166,7 @@ export class VaultComponent implements OnInit, OnDestroy {
                         const pComponent = this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
                         const pCipher = pComponent != null ? pComponent.cipher : null;
                         if (this.cipherId != null && pCipher != null && pCipher.id === this.cipherId &&
-                            pCipher.login != null && pCipher.login.password != null) {
+                            pCipher.login != null && pCipher.login.password != null && pCipher.viewPassword) {
                             this.copyValue(pCipher.login.password, 'password');
                         }
                         break;
@@ -299,7 +299,7 @@ export class VaultComponent implements OnInit, OnDestroy {
                         click: () => this.copyValue(cipher.login.username, 'username'),
                     }));
                 }
-                if (cipher.login.password != null) {
+                if (cipher.login.password != null && cipher.viewPassword) {
                     menu.append(new remote.MenuItem({
                         label: this.i18nService.t('copyPassword'),
                         click: () => {
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 8752b096b08..b0b8db38ee8 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -33,7 +33,7 @@
                             <div [hidden]="!showPassword" class="monospaced password-wrapper" appSelectCopy
                                 [innerHTML]="cipher.login.password | colorPassword"></div>
                         </div>
-                        <div class="action-buttons">
+                        <div class="action-buttons" *ngIf=cipher.viewPassword>
                             <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
                                 appA11yTitle="{{'checkPassword' | i18n}}" (click)="checkPassword()"
                                 [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">