diff --git a/src/app/modal.component.ts b/src/app/modal.component.ts
index 7e00c63be9..1435562c6c 100644
--- a/src/app/modal.component.ts
+++ b/src/app/modal.component.ts
@@ -4,7 +4,6 @@ import {
     Component,
     ComponentFactoryResolver,
     EventEmitter,
-    Input,
     OnDestroy,
     Output,
     Type,
@@ -17,6 +16,10 @@ import {
     template: `<ng-template #container></ng-template>`,
 })
 export class ModalComponent implements OnDestroy {
+    @Output() onClose = new EventEmitter();
+    @Output() onClosed = new EventEmitter();
+    @Output() onShow = new EventEmitter();
+    @Output() onShown = new EventEmitter();
     @ViewChild('container', { read: ViewContainerRef }) container: ViewContainerRef;
     parentContainer: ViewContainerRef = null;
     fade: boolean = true;
@@ -29,6 +32,7 @@ export class ModalComponent implements OnDestroy {
     }
 
     show<T>(type: Type<T>, parentContainer: ViewContainerRef, fade: boolean = true): T {
+        this.onShow.emit();
         this.parentContainer = parentContainer;
         this.fade = fade;
 
@@ -50,10 +54,13 @@ export class ModalComponent implements OnDestroy {
             });
         }
 
+        this.onShown.emit();
         return componentRef.instance;
     }
 
     close() {
+        this.onClose.emit();
+        this.onClosed.emit();
         if (this.parentContainer != null) {
             this.parentContainer.clear();
         }
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 452b9aba0b..add71960b2 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -175,6 +175,11 @@ export class AddEditComponent implements OnChanges {
     }
 
     generatePassword() {
+        if (this.cipher.login != null && this.cipher.login.password != null && this.cipher.login.password.length &&
+            !confirm(this.i18nService.t('overwritePasswordConfirmation'))) {
+            return;
+        }
+
         this.onGeneratePassword.emit();
     }
 }
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 7f15cda9ad..d02bc40701 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -68,7 +68,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="primary" appBlurClick *ngIf="showSelect">
+                <button type="button" class="primary" appBlurClick *ngIf="showSelect" (click)="select()">
                     <i class="fa fa-lg fa-check"></i> {{'select' | i18n}}
                 </button>
                 <button type="button" data-dismiss="modal">{{'close' | i18n}}</button>
diff --git a/src/app/vault/password-generator.component.ts b/src/app/vault/password-generator.component.ts
index 7aff47ee78..c28cd6dd2e 100644
--- a/src/app/vault/password-generator.component.ts
+++ b/src/app/vault/password-generator.component.ts
@@ -20,6 +20,7 @@ import { UtilsService } from 'jslib/abstractions/utils.service';
 })
 export class PasswordGeneratorComponent implements OnInit {
     @Input() showSelect: boolean = false;
+    @Output() onSelected = new EventEmitter<string>();
 
     options: any = {};
     password: string = '-';
@@ -83,4 +84,9 @@ export class PasswordGeneratorComponent implements OnInit {
         this.analytics.eventTrack.next({ action: 'Copied Generated Password' });
         this.utilsService.copyToClipboard(this.password, window.document);
     }
+
+    select() {
+        this.analytics.eventTrack.next({ action: 'Selected Generated Password' });
+        this.onSelected.emit(this.password);
+    }
 }
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 07256ae578..26ee7f2c6e 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -15,6 +15,7 @@ import {
 
 import { Location } from '@angular/common';
 
+import { AddEditComponent } from './add-edit.component';
 import { CiphersComponent } from './ciphers.component';
 import { GroupingsComponent } from './groupings.component';
 import { PasswordGeneratorComponent } from './password-generator.component';
@@ -31,6 +32,7 @@ import { FolderView } from 'jslib/models/view/folderView';
     template: template,
 })
 export class VaultComponent implements OnInit {
+    @ViewChild(AddEditComponent) addEditComponent: AddEditComponent;
     @ViewChild(CiphersComponent) ciphersComponent: CiphersComponent;
     @ViewChild(GroupingsComponent) groupingsComponent: GroupingsComponent;
     @ViewChild('passwordGenerator', { read: ViewContainerRef }) passwordGeneratorModal: ViewContainerRef;
@@ -176,7 +178,15 @@ export class VaultComponent implements OnInit {
         let modal = componentRef.instance as ModalComponent;
         let childComponent = modal.show<PasswordGeneratorComponent>(PasswordGeneratorComponent,
             this.passwordGeneratorModal);
+
         childComponent.showSelect = true;
+        childComponent.onSelected.subscribe((password: string) => {
+            modal.close();
+            if (this.addEditComponent != null && this.addEditComponent.cipher != null &&
+                this.addEditComponent.cipher.login != null) {
+                this.addEditComponent.cipher.login.password = password;
+            }
+        });
     }
 
     private clearFilters() {