diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index b23fc213cf..4667513b53 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -377,6 +377,18 @@
                             <b class="font-weight-semibold">{{'datePasswordUpdated' | i18n}}:</b>
                             {{passwordRevisionDate | date:'medium'}}
                         </div>
+                        <div *ngIf="cipher.hasPasswordHistory">
+                            <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b>
+                            <a href="#" appStopClick (click)="viewHistory()" title="{{'view' | i18n}}">
+                                {{cipher.passwordHistory.length}}
+                            </a>
+                        </div>
+                        <div class="ml-3" *ngIf="viewingPasswordHistory">
+                            <div *ngFor="let ph of cipher.passwordHistory">
+                                {{ph.lastUsedDate | date:'short'}} -
+                                <span class="text-monospace ml-2">{{ph.password}}</span>
+                            </div>
+                        </div>
                     </div>
                 </ng-container>
             </div>
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index ebf697d21d..7627beb53f 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -34,6 +34,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
     totpSec: number;
     totpLow: boolean;
     passwordRevisionDate: Date;
+    viewingPasswordHistory = false;
 
     protected totpInterval: number;
 
@@ -109,6 +110,10 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
         this.messagingService.send('upgradeOrganization', { organizationId: this.cipher.organizationId });
     }
 
+    viewHistory() {
+        this.viewingPasswordHistory = !this.viewingPasswordHistory;
+    }
+
     protected cleanUp() {
         if (this.totpInterval) {
             window.clearInterval(this.totpInterval);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 341a3f2d6c..5bee284983 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2383,7 +2383,7 @@
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Password updated",
+    "message": "Password Updated",
     "description": "ex. Date this password was updated"
   }
 }