diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html
index 6bec1e7b43..ae3576233d 100644
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -20,6 +20,50 @@
                         <label class="form-check-label" for="enabled">{{'enabled' | i18n}}</label>
                     </div>
                 </div>
+                <ng-container *ngIf="type === policyType.MasterPassword">
+                    <div class="form-group">
+                        <label for="masterPassMinLength">{{'minLength' | i18n}}</label>
+                        <input id="masterPassMinLength" class="form-control" type="number" name="MasterPassMinLength"
+                            [(ngModel)]="masterPassMinLength">
+                    </div>
+                </ng-container>
+                <ng-container *ngIf="type === policyType.PasswordGenerator">
+                    <div class="form-group">
+                        <label for="passGenMinLength">{{'minLength' | i18n}}</label>
+                        <input id="passGenMinLength" class="form-control" type="number" name="PassGenMinLength"
+                            [(ngModel)]="passGenMinLength">
+                    </div>
+                    <div class="form-group">
+                        <label for="passGenMinNumbers">{{'minNumbers' | i18n}}</label>
+                        <input id="passGenMinNumbers" class="form-control" type="number" name="PassGenMinNumbers"
+                            [(ngModel)]="passGenMinNumbers">
+                    </div>
+                    <div class="form-group">
+                        <label for="passGenMinSpecial">{{'minSpecial' | i18n}}</label>
+                        <input id="passGenMinSpecial" class="form-control" type="number" name="PassGenMinSpecial"
+                            [(ngModel)]="passGenMinSpecial">
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="passGenUseNumbers"
+                            [(ngModel)]="passGenUseNumbers" name="PassGenUseNumbers">
+                        <label class="form-check-label" for="passGenUseNumbers">0-9</label>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="passGenUseSpecial"
+                            [(ngModel)]="passGenUseSpecial" name="PassGenUseSpecial">
+                        <label class="form-check-label" for="passGenUseSpecial">!@#$%^&amp;*</label>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="passGenUseLower"
+                            [(ngModel)]="passGenUseLower" name="PassGenUseLower">
+                        <label class="form-check-label" for="passGenUseLower">a-z</label>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" id="passGenUseUpper"
+                            [(ngModel)]="passGenUseUpper" name="PassGenUseUpper">
+                        <label class="form-check-label" for="passGenUseUpper">A-Z</label>
+                    </div>
+                </ng-container>
             </div>
             <div class="modal-footer">
                 <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
@@ -31,4 +75,4 @@
             </div>
         </form>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/organizations/manage/policy-edit.component.ts b/src/app/organizations/manage/policy-edit.component.ts
index 8bbd895923..4f0688aa29 100644
--- a/src/app/organizations/manage/policy-edit.component.ts
+++ b/src/app/organizations/manage/policy-edit.component.ts
@@ -31,10 +31,27 @@ export class PolicyEditComponent implements OnInit {
     @Input() organizationId: string;
     @Output() onSavedPolicy = new EventEmitter();
 
+    policyType = PolicyType;
     loading = true;
     enabled = false;
     formPromise: Promise<any>;
 
+    // Master password
+
+    masterPassMinLength?: number;
+
+    // TODO
+
+    // Password generator
+
+    passGenMinLength?: number;
+    passGenMinNumbers?: number;
+    passGenMinSpecial?: number;
+    passGenUseNumbers?: boolean;
+    passGenUseSpecial?: boolean;
+    passGenUseUpper?: boolean;
+    passGenUseLower?: boolean;
+
     private policy: PolicyResponse;
 
     constructor(private apiService: ApiService, private i18nService: I18nService,
@@ -49,7 +66,28 @@ export class PolicyEditComponent implements OnInit {
     async load() {
         try {
             this.policy = await this.apiService.getPolicy(this.organizationId, this.type);
-            this.enabled = this.policy.enabled;
+
+            if (this.policy != null) {
+                this.enabled = this.policy.enabled;
+                if (this.policy.data != null) {
+                    switch (this.type) {
+                        case PolicyType.PasswordGenerator:
+                            this.passGenMinLength = this.policy.data.minLength;
+                            this.passGenMinNumbers = this.policy.data.minNumbers;
+                            this.passGenMinSpecial = this.policy.data.minSpecial;
+                            this.passGenUseLower = this.policy.data.useLower;
+                            this.passGenUseUpper = this.policy.data.useUpper;
+                            this.passGenUseSpecial = this.policy.data.useSpecial;
+                            this.passGenUseNumbers = this.policy.data.useNumbers;
+                            break;
+                        case PolicyType.MasterPassword:
+                            this.masterPassMinLength = this.policy.data.minLength;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
         } catch (e) {
             if (e.statusCode === 404) {
                 this.enabled = false;
@@ -64,6 +102,26 @@ export class PolicyEditComponent implements OnInit {
         request.enabled = this.enabled;
         request.type = this.type;
         request.data = null;
+        switch (this.type) {
+            case PolicyType.PasswordGenerator:
+                request.data = {
+                    minLength: this.passGenMinLength,
+                    minNumbers: this.passGenMinNumbers,
+                    minSpecial: this.passGenMinSpecial,
+                    useNumbers: this.passGenUseNumbers,
+                    useSpecial: this.passGenUseSpecial,
+                    useLower: this.passGenUseLower,
+                    useUpper: this.passGenUseUpper,
+                };
+                break;
+            case PolicyType.MasterPassword:
+                request.data = {
+                    minLength: this.masterPassMinLength,
+                };
+                break;
+            default:
+                break;
+        }
         try {
             this.formPromise = this.apiService.putPolicy(this.organizationId, this.type, request);
             await this.formPromise;
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index dabee692e0..fc469ab7fd 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2953,5 +2953,8 @@
   },
   "manageSubscriptionFromStore": {
     "message": "You must manage your subscription from the store where your in-app purchase was made."
+  },
+  "minLength": {
+    "message": "Minimum Length"
   }
 }