diff --git a/core/app/common/src/lib/record/field.model.ts b/core/app/common/src/lib/record/field.model.ts
index 038ad645c3..c7df0a144b 100644
--- a/core/app/common/src/lib/record/field.model.ts
+++ b/core/app/common/src/lib/record/field.model.ts
@@ -24,13 +24,15 @@
  * the words "Supercharged by SuiteCRM".
  */
 
-import {SearchCriteriaFieldFilter} from '../views/list/search-criteria.model';
+import {cloneDeep, isArray, isEqual, isObject, isString, uniq} from 'lodash-es';
 import {BehaviorSubject, Observable} from 'rxjs';
 import {AsyncValidatorFn, FormArray, FormControl, ValidatorFn} from '@angular/forms';
+import {SearchCriteriaFieldFilter} from '../views/list/search-criteria.model';
 import {Record} from './record.model';
 import {FieldLogicMap} from '../actions/field-logic-action.model';
 import {ObjectMap} from '../types/object-map';
 import {ViewMode} from '../views/view.model';
+import {deepClone} from '../utils/object-utils';
 
 export type DisplayType = 'none' | 'show' | 'readonly' | 'inline' | 'disabled' | 'default';
 
@@ -97,7 +99,7 @@ export interface FieldDefinition {
     default?: string;
     modes?: ViewMode[];
     relationship?: string;
-    relationshipMetadata?: RelationshipMetadata
+    relationshipMetadata?: RelationshipMetadata;
 
     [key: string]: any;
 }
@@ -157,6 +159,16 @@ export interface AttributeDependency {
     types: string[];
 }
 
+export interface FieldValue {
+    value?: string;
+    valueList?: string[];
+    valueObject?: any;
+}
+
+export interface FieldValueMap {
+    [key: string]: FieldValue;
+}
+
 export interface Field {
     type: string;
     value?: string;
@@ -185,11 +197,14 @@ export interface Field {
     asyncValidators?: AsyncValidatorFn[];
     valueSubject?: BehaviorSubject<FieldValue>;
     valueChanges$?: Observable<FieldValue>;
+    options?: Option[];
+    optionsState?: Option[];
+    optionsSubject?: BehaviorSubject<Option[]>;
+    optionsChanges$?: Observable<Option[]>;
     fieldDependencies?: ObjectMap;
     attributeDependencies?: AttributeDependency[];
     logic?: FieldLogicMap;
     displayLogic?: FieldLogicMap;
-    previousValue?: string;
 }
 
 export class BaseField implements Field {
@@ -212,6 +227,9 @@ export class BaseField implements Field {
     attributes?: FieldAttributeMap;
     valueSubject?: BehaviorSubject<FieldValue>;
     valueChanges$?: Observable<FieldValue>;
+    optionsState?: Option[];
+    optionsSubject?: BehaviorSubject<Option[]>;
+    optionsChanges$?: Observable<Option[]>;
     fieldDependencies: ObjectMap = {};
     attributeDependencies: AttributeDependency[] = [];
     logic?: FieldLogicMap;
@@ -225,6 +243,9 @@ export class BaseField implements Field {
     constructor() {
         this.valueSubject = new BehaviorSubject<FieldValue>({} as FieldValue);
         this.valueChanges$ = this.valueSubject.asObservable();
+
+        this.optionsSubject = new BehaviorSubject<Option[]>(this.optionsState);
+        this.optionsChanges$ = this.optionsSubject.asObservable();
     }
 
     get value(): string {
@@ -232,13 +253,19 @@ export class BaseField implements Field {
     }
 
     set value(value: string) {
-        const changed = value !== this.valueState;
+        if (!isString(value)) {
+            this.setValue(value);
+            return;
+        }
 
-        this.valueState = value;
+        const valueClean: string = value.trim();
 
-        if (changed) {
-            this.emitValueChanges();
+        if (isEqual(this.valueState, valueClean)) {
+            return;
         }
+
+        this.valueState = valueClean;
+        this.emitValueChanges();
     }
 
     get valueList(): string[] {
@@ -246,9 +273,18 @@ export class BaseField implements Field {
     }
 
     set valueList(value: string[]) {
+        if (!isArray(value)) {
+            this.setValue(value);
+            return;
+        }
 
-        this.valueListState = value;
+        const valueListClean: string[] = uniq(deepClone(value));
 
+        if (isEqual(this.valueListState, valueListClean)) {
+            return;
+        }
+
+        this.valueListState = valueListClean;
         this.emitValueChanges();
     }
 
@@ -257,7 +293,16 @@ export class BaseField implements Field {
     }
 
     set valueObject(value: any) {
-        this.valueObjectState = value;
+        if (!isObject(value)) {
+            this.setValue(value);
+            return;
+        }
+
+        if (isEqual(this.valueObjectState, value)) {
+            return;
+        }
+
+        this.valueObjectState = deepClone(value);
         this.emitValueChanges();
     }
 
@@ -266,23 +311,45 @@ export class BaseField implements Field {
     }
 
     set valueObjectArray(value: ObjectMap[]) {
+        if (isEqual(this.valueObjectArrayState, value)) {
+            return;
+        }
+
         this.valueObjectArrayState = value;
         this.emitValueChanges();
     }
 
-    protected emitValueChanges() {
+    public setValue(value: string | string[] | any): void {
+        if (isString(value)) {
+            this.value = value;
+        } else if (isArray(value)) {
+            this.valueList = value;
+        } else if (isObject(value)) {
+            this.valueObject = value;
+        } else {
+            this.value = value?.toString() ?? '';
+        }
+    }
+
+    protected emitValueChanges(): void {
         this.valueSubject.next({
             value: this.valueState,
             valueList: this.valueListState,
             valueObject: this.valueObjectState
-        })
+        });
     }
-}
 
-export interface FieldValue {
-    value?: string;
-    valueList?: string[];
-    valueObject?: any;
-}
+    get options(): Option[] {
+        return this.optionsState
+    }
 
+    set options(options: Option[]) {
+        this.optionsState = options;
+        this.emitOptionsChanges();
+    }
+
+    protected emitOptionsChanges() {
+        this.optionsSubject.next(cloneDeep(this.optionsState))
+    }
 
+}
diff --git a/core/app/core/src/lib/fields/base/base-enum.component.ts b/core/app/core/src/lib/fields/base/base-enum.component.ts
index cc9f1eb5db..87d44a6130 100644
--- a/core/app/core/src/lib/fields/base/base-enum.component.ts
+++ b/core/app/core/src/lib/fields/base/base-enum.component.ts
@@ -24,17 +24,13 @@
  * the words "Supercharged by SuiteCRM".
  */
 
-import {BaseFieldComponent} from './base-field.component';
+import {isEmpty, isNull, isObject} from 'lodash-es';
+import {combineLatest, of, Subscription} from 'rxjs';
 import {Component, OnDestroy, OnInit} from '@angular/core';
-import {Subscription} from 'rxjs';
-import {Field, FieldDefinition, isEmptyString, isVoid, Option} from 'common';
+import {deepClone, Field, FieldDefinition, FieldValue, isEmptyString, isVoid, Option} from 'common';
+import {BaseFieldComponent} from './base-field.component';
 import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service';
-import {
-    LanguageListStringMap,
-    LanguageStore,
-    LanguageStringMap,
-    LanguageStrings
-} from '../../store/language/language.store';
+import {LanguageListStringMap, LanguageStore, LanguageStringMap} from '../../store/language/language.store';
 import {FieldLogicManager} from '../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-display.manager';
 
@@ -42,12 +38,11 @@ import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-displ
 export class BaseEnumComponent extends BaseFieldComponent implements OnInit, OnDestroy {
     selectedValues: Option[] = [];
     valueLabel = '';
-    optionsMap: LanguageStringMap;
+    optionsMap: LanguageStringMap = {};
     options: Option[] = [];
     labels: LanguageStringMap;
     protected subs: Subscription[] = [];
     protected mappedOptions: { [key: string]: Option[] };
-    protected isDynamicEnum = false;
 
     constructor(
         protected languages: LanguageStore,
@@ -58,137 +53,48 @@ export class BaseEnumComponent extends BaseFieldComponent implements OnInit, OnD
         super(typeFormatter, logic, logicDisplay);
     }
 
-    ngOnInit(): void {
-
+    /**
+     *
+     */
+    public ngOnInit(): void {
         super.ngOnInit();
 
-        const options$ = this?.field?.metadata?.options$ ?? null;
-        if (options$) {
-            this.subs.push(this.field.metadata.options$.subscribe((options: Option[]) => {
-                this.buildProvidedOptions(options);
-
-                this.initValue();
-
-            }));
-            return;
-
-        }
-
-        const options = this?.field?.definition?.options ?? null;
-        if (options) {
-            this.subs.push(this.languages.vm$.subscribe((strings: LanguageStrings) => {
+        this.subscribeValueAndOptionChanges();
 
-                this.buildAppStringListOptions(strings.appListStrings);
-                this.initValue();
-
-            }));
-        }
-
-        if (!options && !options$) {
-            this.initValue();
-        }
-
-    }
-
-    ngOnDestroy(): void {
-        this.isDynamicEnum = false;
-        this.subs.forEach(sub => sub.unsubscribe());
+        this.initAsEnumAndDynamicIf();
     }
 
-    getInvalidClass(): string {
+    /**
+     *
+     */
+    public getInvalidClass(): string {
         if (this.field.formControl && this.field.formControl.invalid && this.field.formControl.touched) {
             return 'is-invalid';
         }
         return '';
     }
 
-    protected buildProvidedOptions(options: Option[]): void {
-        this.options = options;
-        this.optionsMap = {};
-
-        options.forEach(option => {
-            this.optionsMap[option.value] = option.label;
-        });
-
-    }
-
-    protected buildAppStringListOptions(appStrings: LanguageListStringMap): void {
-
-        this.optionsMap = {} as LanguageStringMap;
-        this.addExtraOptions();
-
-        if (appStrings && this.field.definition.options && appStrings[this.field.definition.options]) {
-            const options = appStrings[this.field.definition.options] as LanguageStringMap;
-
-            if (this.options && Object.keys(this.options)) {
-                this.optionsMap = {...this.optionsMap, ...options};
-            }
-        }
-
-        this.buildOptionsArray(appStrings);
-    }
-
-    protected addExtraOptions(): void {
-        const extraOptions = (this.field.metadata && this.field.metadata.extraOptions) || [];
-
-        extraOptions.forEach((item: Option) => {
-            if (isVoid(item.value)) {
-                return;
-            }
-
-            let label = item.label || '';
-            if (item.labelKey) {
-                label = this.languages.getFieldLabel(item.labelKey);
-            }
-
-            this.optionsMap[item.value] = label;
-        });
-    }
-
-    protected buildOptionsArray(appStrings: LanguageListStringMap): void {
-
-        this.options = [];
-        Object.keys(this.optionsMap).forEach(key => {
-
-            this.options.push({
-                value: key,
-                label: this.optionsMap[key]
-            });
-        });
-
-        if (this.isDynamicEnum) {
-            this.buildDynamicEnumOptions(appStrings);
-        }
-    }
-
+    /**
+     *
+     * @protected
+     */
     protected initValue(): void {
+        const fieldValue = this.field.value ?? '';
 
-        this.selectedValues = [];
-
-        if (!this.field.value) {
+        if (isEmptyString(fieldValue)) {
             this.initEnumDefault();
             return;
         }
 
-        if (typeof this.field.value !== 'string') {
+        if (
+            !isEmpty(this.field.options)
+            && !this.field.options.find(option => option.value === fieldValue)
+        ) {
+            this.updateInternalState();
             return;
         }
 
-        if (!this.optionsMap) {
-            return;
-        }
-
-        if (typeof this.optionsMap[this.field.value] !== 'string') {
-            return;
-        }
-
-        if (this.field.value) {
-            this.valueLabel = this.optionsMap[this.field.value];
-            this.selectedValues.push({
-                value: this.field.value,
-                label: this.valueLabel
-            });
-        }
+        this.updateInternalState(fieldValue);
     }
 
     /**
@@ -198,104 +104,164 @@ export class BaseEnumComponent extends BaseFieldComponent implements OnInit, OnD
      *  @description set default enum value, if defined in vardefs
      * */
     protected initEnumDefault(): void {
+        const defaultValue = this.field.definition?.default;
 
-        if (!isEmptyString(this.record?.id)) {
+        if (
+            isEmptyString(this.record?.id)
+            && !isVoid(defaultValue)
+        ) {
+            this.updateInternalState(defaultValue);
+            return;
+        }
 
-            this.field?.formControl.setValue('');
+        this.updateInternalState();
+    }
 
-            return;
+    /**
+     *
+     * @param value
+     * @protected
+     */
+    protected updateInternalState(value = ''): void {
+        this.selectedValues = [];
+        const option = this.buildOptionFromValue(value);
+        if (!isEmptyString(option.value)) {
+            this.selectedValues.push(option);
         }
+        this.valueLabel = option.label;
+        this.setFormControlValue(option.value);
+    }
 
-        let defaultVal = this.field?.definition?.default;
-        if (typeof defaultVal === 'string') {
-            defaultVal = defaultVal.trim();
+    /**
+     *
+     * @param value
+     * @protected
+     */
+    protected buildOptionFromValue(value: string): Option {
+        const option: Option = {value: '', label: ''};
+
+        if (isNull(value)) {
+            return option;
         }
-        if (!defaultVal) {
-            this.field.formControl.setValue('');
-            return;
+        option.value = (typeof value !== 'string' ? JSON.stringify(value) : value).trim();
+        option.label = option.value;
+
+        const valueLabel = this.optionsMap[option.value] ?? option.label;
+        if (isObject(valueLabel)) {
+            return option;
         }
+        option.label = (typeof valueLabel !== 'string' ? JSON.stringify(valueLabel) : valueLabel).trim();
 
-        this.selectedValues.push({
-            value: defaultVal,
-            label: this.optionsMap[defaultVal]
-        });
+        return option;
+    }
 
-        this.initEnumDefaultFieldValues(defaultVal);
+    protected buildProvidedOptions(options: Option[]): void {
+        this.addExtraOptions(options);
+        this.addConditionalOptions(options);
+
+        this.optionsMap = {} as LanguageStringMap;
+        options.forEach(option => this.addToOptionMap(option));
+
+        this.options = Object.entries(this.optionsMap)
+            .map(([value, label]) => ({value, label}));
     }
 
-    protected initEnumDefaultFieldValues(defaultVal: string): void {
+    protected addExtraOptions(options: Option[]): void {
+        const extraOptions = this.field.metadata?.extraOptions ?? [];
 
-        if (this.field.type === 'multienum') {
-            const defaultValues = this.selectedValues.map(option => option.value);
-            this.field.valueList = defaultValues;
-            this.field.formControl.setValue(defaultValues);
+        extraOptions.forEach(extraOption=>options.push(extraOption));
+    }
 
-        } else {
-            this.field.value = defaultVal;
-            this.field.formControl.setValue(defaultVal);
-        }
-        this.field.formControl.markAsDirty();
+    protected addConditionalOptions(options: Option[]): void {
+        const conditionalOptions = this.field.metadata?.conditionalOptions ?? {};
+
+        Object.values(conditionalOptions).forEach(extraOption => options.push(<Option>extraOption));
     }
 
-    protected checkAndInitAsDynamicEnum(): void {
+    protected addToOptionMap(option: Option): void {
+        if (isVoid(option.value)) {
+            return;
+        }
+
+        let label = option.label || '';
+        if (option.labelKey) {
+            label = this.languages.getFieldLabel(option.labelKey, this.record.module) || option.labelKey;
+        }
 
-        const definition = (this.field && this.field.definition) || {} as FieldDefinition;
-        const dynamic = (definition && definition.dynamic) || false;
-        const parentEnumKey = (definition && definition.parentenum) || '';
-        const fields = (this.record && this.record.fields) || null;
+        this.optionsMap[option.value] = label;
+    }
 
-        if (dynamic && parentEnumKey && fields) {
-            this.isDynamicEnum = true;
-            const parentEnum: Field = fields[parentEnumKey];
-            if (parentEnum) {
-                this.subscribeToParentValueChanges(parentEnum);
+    private subscribeValueAndOptionChanges(): void {
+        this.subscribeValueChanges();
+
+        const valueAndOptionChanges = combineLatest([
+            this.field.valueChanges$,
+            this.field.optionsChanges$
+        ]).subscribe(([_, options]) => {
+            if (options) {
+                this.buildProvidedOptions(options);
             }
-        }
+            this.initValue();
+        });
+
+        this.subs.push(valueAndOptionChanges);
     }
 
-    protected buildDynamicEnumOptions(appStrings: LanguageListStringMap): void {
+    private initAsEnumAndDynamicIf(): void {
+        const definition = (this.field.definition ?? {});
+        const dynamic = definition?.dynamic ?? false;
+        const parentEnumKey = definition?.parentenum ?? '';
+        const fields = this.record?.fields ?? {};
 
-        const parentEnum = this.record.fields[this.field.definition.parentenum];
+        const parentEnum = dynamic ? fields[parentEnumKey] ?? null : null;
 
-        if (parentEnum) {
+        this.subscribeToParentValueChanges(parentEnum);
+    }
 
-            const parentOptionMap: LanguageStringMap = appStrings[parentEnum.definition.options] as LanguageStringMap;
+    private subscribeToParentValueChanges(parentEnum: Field | null): void {
+        const parentValueChangesSubscription = combineLatest([
+            parentEnum?.valueChanges$ ?? of({} as FieldValue),
+            this.languages.vm$
+        ]).subscribe(([parentFieldValue, languageStrings]) => {
+            const appStrings = languageStrings.appListStrings ?? {};
+            const optionsKey = this.field.definition?.options ?? '';
 
-            if (parentOptionMap && Object.keys(parentOptionMap).length !== 0) {
+            const optionsMap = (appStrings[optionsKey] ?? {}) as LanguageStringMap;
+            let options: Option[] = Object.entries(optionsMap)
+                .map(([value, label]) => ({value, label}));
 
-                this.mappedOptions = this.createParentChildOptionsMap(parentOptionMap, this.options);
+            options = this.getDynamicEnumOptions(parentEnum,appStrings,parentFieldValue,options);
 
-                let parentValues: string[] = [];
-                if (parentEnum.definition.type === 'multienum') {
-                    parentValues = parentEnum.valueList;
-                } else {
-                    parentValues.push(parentEnum.value);
-                }
-                this.options = this.filterMatchingOptions(parentValues);
+            this.field.options = options;
+        });
 
-            }
-        }
+        this.subs.push(parentValueChangesSubscription);
     }
 
-    protected filterMatchingOptions(values: string[]): Option[] {
+    private getDynamicEnumOptions(parentEnum: Field | null, appStrings: LanguageListStringMap, parentFieldValue: FieldValue, prevOptions: Option[]): Option[] {
+        if (isEmpty(parentEnum)) {
+            return prevOptions;
+        }
 
-        let filteredOptions: Option[] = [];
+        const parentOptionsKey = parentEnum?.definition.options ?? '';
 
-        if (!values || !values.length) {
-            return [];
+        const parentOptionMap: LanguageStringMap = (appStrings[parentOptionsKey] ?? {}) as LanguageStringMap;
+        if (isEmpty(parentOptionMap)) {
+            return prevOptions;
         }
 
-        values.forEach(value => {
-            if (!this.mappedOptions[value]) {
-                return;
-            }
-            filteredOptions = filteredOptions.concat([...this.mappedOptions[value]]);
-        });
+        this.mappedOptions = this.createParentChildOptionsMap(parentOptionMap, prevOptions);
+        let parentValues: string[] = [];
+        if (!isEmpty(parentFieldValue.valueList)) {
+            parentValues = parentFieldValue.valueList;
+        } else if (parentEnum.value) {
+            parentValues = [parentFieldValue.value ?? ''];
+        }
 
-        return filteredOptions;
+        return this.filterMatchingOptions(parentValues);
     }
 
-    protected createParentChildOptionsMap(parentOptions: LanguageStringMap, childOptions: Option[]): { [key: string]: Option[] } {
+    private createParentChildOptionsMap(parentOptions: LanguageStringMap, childOptions: Option[]): { [key: string]: Option[] } {
         const mappedOptions: { [key: string]: Option[] } = {};
         Object.keys(parentOptions).forEach(key => {
             mappedOptions[key] = childOptions.filter(
@@ -305,24 +271,19 @@ export class BaseEnumComponent extends BaseFieldComponent implements OnInit, OnD
         return mappedOptions;
     }
 
-    protected subscribeToParentValueChanges(parentEnum: Field): void {
-        if (parentEnum.formControl) {
-            this.subs.push(parentEnum.formControl.valueChanges.subscribe(values => {
-
-                if (typeof values === 'string') {
-                    values = [values];
-                }
-
-                // Reset selected values on Form Control
-                this.field.value = '';
-                this.field.formControl.setValue('');
+    private filterMatchingOptions(values: string[]): Option[] {
+        if (isEmpty(values)) {
+            return [];
+        }
 
-                // Rebuild available enum options
-                this.options = this.filterMatchingOptions(values);
+        let filteredOptions: Option[] = [];
+        values.forEach(value => {
+            if (!this.mappedOptions[value]) {
+                return;
+            }
+            filteredOptions = filteredOptions.concat([...deepClone(this.mappedOptions[value])]);
+        });
 
-                this.initValue();
-            }));
-        }
+        return filteredOptions;
     }
-
 }
diff --git a/core/app/core/src/lib/fields/base/base-field.component.ts b/core/app/core/src/lib/fields/base/base-field.component.ts
index 98d1b4dc03..3adc6acef2 100644
--- a/core/app/core/src/lib/fields/base/base-field.component.ts
+++ b/core/app/core/src/lib/fields/base/base-field.component.ts
@@ -24,12 +24,13 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import { isEqual } from 'lodash-es';
+import { Subscription } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 import {Component, Input, OnDestroy, OnInit} from '@angular/core';
+import { AttributeDependency, deepClone, Field, FieldValue, isVoid, ObjectMap, Record, ViewMode } from 'common';
 import {FieldComponentInterface} from './field.interface';
-import {AttributeDependency, Field, isVoid, ObjectMap, Record, ViewMode} from 'common';
-import {Subscription} from 'rxjs';
 import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service';
-import {debounceTime} from 'rxjs/operators';
 import {FieldLogicManager} from '../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../field-logic-display/field-logic-display.manager';
 
@@ -43,6 +44,11 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
     dependentFields: ObjectMap = {};
     dependentAttributes: AttributeDependency[] = [];
     protected subs: Subscription[] = [];
+    protected previousValue?: FieldValue = {
+        value: '',
+        valueList: [],
+        valueObject: {},
+    };
 
     constructor(
         protected typeFormatter: DataTypeFormatter,
@@ -73,7 +79,12 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
         const fieldKeys = (this.record.fields && Object.keys(this.record.fields)) || [];
         if (fieldKeys.length > 1) {
             this.calculateDependentFields(fieldKeys);
-            this.field.previousValue = this.field.value;
+            this.previousValue = deepClone({
+                value: this.field.value,
+                valueList: this.field.valueList,
+                valueObject: this.field.valueObject,
+                forceNotEqual: 'forceNotEqual'
+            });
 
             if((this.dependentFields && Object.keys(this.dependentFields).length) || this.dependentAttributes.length) {
                 Object.keys(this.dependentFields).forEach(fieldKey => {
@@ -94,7 +105,10 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
                 });
             }
 
-            if (this.field.valueChanges$ && ((this.dependentFields && Object.keys(this.dependentFields).length) || this.dependentAttributes.length)) {
+            if (
+                this.field.valueChanges$
+                && ((this.dependentFields && Object.keys(this.dependentFields).length) || this.dependentAttributes.length)
+            ) {
                 this.subs.push(this.field.valueChanges$.pipe(debounceTime(500)).subscribe((data) => {
                     Object.keys(this.dependentFields).forEach(fieldKey => {
                         const dependentField = this.dependentFields[fieldKey];
@@ -103,7 +117,7 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
                             return;
                         }
 
-                        if(this.field.previousValue != data.value) {
+                        if (!isEqual(this.previousValue, data)) {
                             const types = dependentField.type ?? [];
 
                             if (types.includes('logic')) {
@@ -115,7 +129,11 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
                             }
                         }
                     });
-                    this.field.previousValue = data.value;
+                    this.previousValue = deepClone({
+                        value: data.value,
+                        valueList: data.valueList,
+                        valueObject: data.valueObject
+                    });
 
                     this.dependentAttributes.forEach(dependency => {
                         const field = this.record.fields[dependency.field] || {} as Field;
@@ -136,7 +154,8 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     /**
      * Calculate dependent fields
-     * @param {array} fieldKeys
+     *
+     * @param {Array} fieldKeys FieldKeys
      */
     protected calculateDependentFields(fieldKeys: string[]): void {
         fieldKeys.forEach(key => {
@@ -156,9 +175,10 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     /**
      * Add field dependency
-     * @param {string} fieldKey
-     * @param {array} dependentFields
-     * @param {object} dependentAttributes
+     *
+     * @param {string} fieldKey Field Key
+     * @param {Array} dependentFields Dependent Fields
+     * @param {object} dependentAttributes Dependent Attributes
      */
     protected addFieldDependency(fieldKey: string, dependentFields: ObjectMap, dependentAttributes: AttributeDependency[]): void {
         const field = this.record.fields[fieldKey];
@@ -184,7 +204,7 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
                 dependentAttributes.push({
                     field: fieldKey,
                     attribute: attributeKey,
-                    types: dependentFields[name]['types'] ?? []
+                    types: dependentFields[name].types ?? []
                 });
             }
         });
@@ -192,8 +212,9 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     /**
      * Check if field is dependency
-     * @param dependencies
-     * @returns {boolean}
+     *
+     * @param {ObjectMap} dependencies Dependencies
+     * @returns {boolean} Is Dependency Field
      */
     protected isDependencyField(dependencies: ObjectMap): boolean {
         const name = this.field.name || this.field.definition.name || '';
@@ -203,9 +224,10 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     /**
      * Add attribute dependency
-     * @param {string} fieldKey
-     * @param {array} dependentFields
-     * @param {object} dependentAttributes
+     *
+     * @param {string} fieldKey Field Key
+     * @param {Array} dependentFields Dependent Fields
+     * @param {object} dependentAttributes Dependent Attributes
      */
     protected addAttributeDependency(fieldKey: string, dependentFields: ObjectMap, dependentAttributes: AttributeDependency[]): void {
         const field = this.record.fields[fieldKey];
@@ -231,7 +253,7 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
                 dependentAttributes.push({
                     field: fieldKey,
                     attribute: attributeKey,
-                    types: dependentFields[name]['types'] ?? []
+                    types: (dependentFields[name] ?? {}).types ?? []
                 });
             }
         });
@@ -239,8 +261,9 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     /**
      * Check if attribute is dependency
-     * @param {object} attributeDependencies
-     * @returns {boolean}
+     *
+     * @param {object} attributeDependencies Attribute Dependencies
+     * @returns {boolean} Is Dependency Attribute
      */
     protected isDependencyAttribute(attributeDependencies: AttributeDependency[]): boolean {
 
@@ -254,7 +277,7 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
         if (this.field && this.field.formControl) {
             this.subs.push(this.field.formControl.valueChanges.subscribe(value => {
 
-                if (!isVoid(value)) {
+                if (!isVoid(value) && typeof value === 'string') {
                     value = value.trim();
                 } else {
                     value = '';
@@ -274,10 +297,19 @@ export class BaseFieldComponent implements FieldComponentInterface, OnInit, OnDe
 
     }
 
-    protected setFieldValue(newValue): void {
+    protected setFieldValue(newValue: string): void {
         this.field.value = newValue;
     }
 
+    protected setFormControlValue(newValue: string | string[]): void {
+        this.field.formControl.markAsDirty();
+
+        if (isEqual(this.field.formControl.value, newValue)) {
+            return;
+        }
+        this.field.formControl.setValue(newValue);
+    }
+
     protected unsubscribeAll(): void {
         this.subs.forEach(sub => sub.unsubscribe());
     }
diff --git a/core/app/core/src/lib/fields/base/base-multienum.component.ts b/core/app/core/src/lib/fields/base/base-multienum.component.ts
index 6e1c9c467e..d67864f6ed 100644
--- a/core/app/core/src/lib/fields/base/base-multienum.component.ts
+++ b/core/app/core/src/lib/fields/base/base-multienum.component.ts
@@ -24,6 +24,8 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import { isArray, isEmpty, uniqBy } from 'lodash-es';
+import { isVoid } from 'common';
 import {Component} from '@angular/core';
 import {DataTypeFormatter} from '../../services/formatters/data-type.formatter.service';
 import {BaseEnumComponent} from './base-enum.component';
@@ -43,22 +45,42 @@ export class BaseMultiEnumComponent extends BaseEnumComponent {
         super(languages, typeFormatter, logic, logicDisplay);
     }
 
+    protected subscribeValueChanges(): void {
+        if (!this.field?.formControl) {
+            return;
+        }
+
+        const formValueChangesSubscription = this.field.formControl.valueChanges.subscribe(
+            (value: string[]) => this.field.valueList = value);
+
+        this.subs.push(formValueChangesSubscription);
+    }
+
     protected initValue(): void {
-        this.selectedValues = [];
+        const fieldValueList = this.field.valueList;
 
-        if (!this.field.valueList || this.field.valueList.length < 1) {
+        if (isVoid(fieldValueList) || isEmpty(fieldValueList)) {
             this.initEnumDefault();
             return;
         }
 
-        this.field.valueList.forEach(value => {
-            if (typeof this.optionsMap[value] !== 'string') {
-                return;
-            }
-            this.selectedValues.push({
-                value,
-                label: this.optionsMap[value]
-            });
-        });
+        this.updateInternalState(fieldValueList);
+    }
+
+    protected updateInternalState(value: string | string[] = []): void {
+        const valueArray = isArray(value) ? value : [value];
+
+        this.selectedValues = valueArray.map(valueElement=>this.buildOptionFromValue(valueElement));
+        this.selectedValues = uniqBy(this.selectedValues, 'value');
+
+        this.syncSelectedValuesWithForm();
+    }
+
+    protected syncSelectedValuesWithForm(): string[] {
+        const selectedValuesValueMap = this.selectedValues.map(selectedValue => selectedValue.value);
+
+        this.setFormControlValue(selectedValuesValueMap);
+
+        return selectedValuesValueMap;
     }
 }
diff --git a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.html b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.html
index 8e2ca04159..f0e1579a07 100644
--- a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.html
+++ b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.html
@@ -28,6 +28,7 @@
 <div class="dropdownenum">
     <select [formControl]="field.formControl" class="custom-select custom-select-sm">
         <ng-container *ngIf="this.options && this.options.length">
+            <option class="d-none" disabled value=""></option>
             <option *ngFor="let item of this.options;"
                     class="{{getId(item)}}"
                     [ngValue]="item.value">
diff --git a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts
index 52c6e5f71b..153db97204 100644
--- a/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts
+++ b/core/app/core/src/lib/fields/dropdownenum/templates/edit/dropdownenum.component.ts
@@ -24,22 +24,23 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import {Option} from 'common';
 import {Component} from '@angular/core';
+import {FormGroup} from '@angular/forms';
 import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service';
-import {BaseEnumComponent} from '../../../base/base-enum.component';
 import {LanguageStore} from '../../../../store/language/language.store';
-import {FormGroup} from '@angular/forms';
-import {Option} from 'common';
 import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
+import {DropdownEnumDetailFieldComponent} from '../detail/dropdownenum.component';
 
 @Component({
     selector: 'scrm-dropdownenum-edit',
     templateUrl: './dropdownenum.component.html',
     styleUrls: []
 })
-export class DropdownEnumEditFieldComponent extends BaseEnumComponent {
+export class DropdownEnumEditFieldComponent extends DropdownEnumDetailFieldComponent {
     formGroup: FormGroup;
+    optionsHasEmptyValue = false;
 
     constructor(
         protected languages: LanguageStore,
@@ -53,10 +54,8 @@ export class DropdownEnumEditFieldComponent extends BaseEnumComponent {
     ngOnInit(): void {
         super.ngOnInit();
 
-        this.subscribeValueChanges();
-
         if (this.record && this.record.formGroup) {
-            this.formGroup = this.record.formGroup
+            this.formGroup = this.record.formGroup;
         } else {
             this.formGroup = new FormGroup({});
             this.formGroup.addControl(this.field.name, this.field.formControl);
@@ -64,7 +63,14 @@ export class DropdownEnumEditFieldComponent extends BaseEnumComponent {
 
     }
 
-    public getId(item: Option) {
+    public getId(item: Option): string {
         return this.field.name + '-' + item.value;
     }
+
+    protected buildProvidedOptions(options: Option[]): void {
+        super.buildProvidedOptions(options);
+
+        this.optionsHasEmptyValue = !!options.find(option => option.value === '');
+    }
+
 }
diff --git a/core/app/core/src/lib/fields/dynamicenum/templates/edit/dynamicenum.component.ts b/core/app/core/src/lib/fields/dynamicenum/templates/edit/dynamicenum.component.ts
index c083b3d117..f634910bb2 100644
--- a/core/app/core/src/lib/fields/dynamicenum/templates/edit/dynamicenum.component.ts
+++ b/core/app/core/src/lib/fields/dynamicenum/templates/edit/dynamicenum.component.ts
@@ -27,17 +27,17 @@
 import {Component, ViewChild} from '@angular/core';
 import {TagInputComponent} from 'ngx-chips';
 import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service';
-import {BaseEnumComponent} from '../../../base/base-enum.component';
 import {LanguageStore} from '../../../../store/language/language.store';
 import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
+import { DynamicEnumDetailFieldComponent } from '../detail/dynamicenum.component';
 
 @Component({
     selector: 'scrm-dynamicenum-edit',
     templateUrl: './dynamicenum.component.html',
     styleUrls: []
 })
-export class DynamicEnumEditFieldComponent extends BaseEnumComponent {
+export class DynamicEnumEditFieldComponent extends DynamicEnumDetailFieldComponent {
 
     @ViewChild('tag') tag: TagInputComponent;
 
@@ -50,30 +50,20 @@ export class DynamicEnumEditFieldComponent extends BaseEnumComponent {
         super(languages, typeFormatter, logic, logicDisplay);
     }
 
-    ngOnInit(): void {
-        super.ngOnInit();
-    }
-
     public onAdd(item): void {
-        if (item && item.value) {
-            this.field.value = item.value;
-            this.field.formControl.setValue(item.value);
-            this.field.formControl.markAsDirty();
+        if (item?.value) {
+            this.updateInternalState(item.value);
             return;
         }
 
-        this.field.value = '';
-        this.field.formControl.setValue('');
-        this.field.formControl.markAsDirty();
-        this.selectedValues = [];
+        this.updateInternalState();
 
         return;
     }
 
     public onRemove(): void {
-        this.field.value = '';
-        this.field.formControl.setValue('');
-        this.field.formControl.markAsDirty();
+        this.updateInternalState();
+
         setTimeout(() => {
             this.tag.focus(true, true);
             this.tag.dropdown.show();
diff --git a/core/app/core/src/lib/fields/enum/templates/edit/enum.component.ts b/core/app/core/src/lib/fields/enum/templates/edit/enum.component.ts
index 9b3ba0cc13..e2cd77161f 100644
--- a/core/app/core/src/lib/fields/enum/templates/edit/enum.component.ts
+++ b/core/app/core/src/lib/fields/enum/templates/edit/enum.component.ts
@@ -24,12 +24,13 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import { isEmpty } from 'lodash-es';
 import {Component, ViewChild} from '@angular/core';
 import {TagInputComponent} from 'ngx-chips';
 import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service';
 import {BaseEnumComponent} from '../../../base/base-enum.component';
 import {LanguageStore} from '../../../../store/language/language.store';
-import {TagModel} from "ngx-chips/core/accessor";
+import {TagModel} from 'ngx-chips/core/accessor';
 import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
 
@@ -51,32 +52,18 @@ export class EnumEditFieldComponent extends BaseEnumComponent {
         super(languages, typeFormatter, logic, logicDisplay);
     }
 
-    ngOnInit(): void {
-
-        this.checkAndInitAsDynamicEnum();
-        super.ngOnInit();
-    }
-
     public onAdd(item): void {
-        if (item && item.value) {
-            this.field.value = item.value;
-            this.field.formControl.setValue(item.value);
-            this.field.formControl.markAsDirty();
+        if (!item?.value) {
+            this.updateInternalState();
             return;
         }
 
-        this.field.value = '';
-        this.field.formControl.setValue('');
-        this.field.formControl.markAsDirty();
-        this.selectedValues = [];
-
-        return;
+        this.updateInternalState(item.value);
     }
 
     public onRemove(): void {
-        this.field.value = '';
-        this.field.formControl.setValue('');
-        this.field.formControl.markAsDirty();
+        this.updateInternalState();
+
         setTimeout(() => {
             this.tag.focus(true, true);
             this.tag.dropdown.show();
@@ -89,12 +76,14 @@ export class EnumEditFieldComponent extends BaseEnumComponent {
 
     public selectFirstElement(): void {
         const filteredElements: TagModel = this.tag.dropdown.items;
-        if (filteredElements.length !== 0) {
-            const firstElement = filteredElements[0];
-            this.selectedValues.push(firstElement);
-            this.onAdd(firstElement);
-            this.tag.dropdown.hide();
+
+        if (isEmpty(filteredElements)) {
+            return;
         }
+
+        const firstElement = filteredElements[0];
+        this.onAdd(firstElement);
+        this.tag.dropdown.hide();
     }
 
 }
diff --git a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts
index 06392174c3..acd1244ff4 100644
--- a/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts
+++ b/core/app/core/src/lib/fields/multienum/templates/edit/multienum.component.ts
@@ -24,21 +24,22 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import { isEmpty } from 'lodash-es';
 import {Component, ViewChild} from '@angular/core';
 import {TagInputComponent} from 'ngx-chips';
+import { TagModel } from 'ngx-chips/core/accessor';
 import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service';
-import {BaseMultiEnumComponent} from '../../../base/base-multienum.component';
 import {LanguageStore} from '../../../../store/language/language.store';
-import {TagModel} from "ngx-chips/core/accessor";
 import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
+import { MultiEnumDetailFieldComponent } from '../detail/multienum.component';
 
 @Component({
     selector: 'scrm-multienum-edit',
     templateUrl: './multienum.component.html',
     styleUrls: []
 })
-export class MultiEnumEditFieldComponent extends BaseMultiEnumComponent {
+export class MultiEnumEditFieldComponent extends MultiEnumDetailFieldComponent {
 
     @ViewChild('tag') tag: TagInputComponent;
 
@@ -51,25 +52,12 @@ export class MultiEnumEditFieldComponent extends BaseMultiEnumComponent {
         super(languages, typeFormatter, logic, logicDisplay);
     }
 
-    ngOnInit(): void {
-        this.checkAndInitAsDynamicEnum();
-        super.ngOnInit();
-    }
-
     public onAdd(): void {
-        const value = this.selectedValues.map(option => option.value);
-        this.field.valueList = value;
-        this.field.formControl.setValue(value);
-        this.field.formControl.markAsDirty();
-
-        return;
+        this.syncSelectedValuesWithForm();
     }
 
     public onRemove(): void {
-        const value = this.selectedValues.map(option => option.value);
-        this.field.valueList = value;
-        this.field.formControl.setValue(value);
-        this.field.formControl.markAsDirty();
+        this.syncSelectedValuesWithForm();
 
         setTimeout(() => {
             this.tag.focus(true, true);
@@ -83,12 +71,15 @@ export class MultiEnumEditFieldComponent extends BaseMultiEnumComponent {
 
     public selectFirstElement(): void {
         const filteredElements: TagModel = this.tag.dropdown.items;
-        if (filteredElements.length !== 0) {
-            const firstElement = filteredElements[0];
-            this.selectedValues.push(firstElement);
-            this.onAdd();
-            this.tag.dropdown.hide();
+
+        if (isEmpty(filteredElements)) {
+            return;
         }
+
+        const firstElement = filteredElements[0];
+        this.selectedValues.push(firstElement);
+        this.onAdd();
+        this.tag.dropdown.hide();
     }
 
 }
diff --git a/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.ts b/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.ts
index ce9be21336..ae4c19290f 100644
--- a/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.ts
+++ b/core/app/core/src/lib/fields/multienum/templates/filter/multienum.component.ts
@@ -24,21 +24,21 @@
  * the words "Supercharged by SuiteCRM".
  */
 
+import { isEmpty } from 'lodash-es';
 import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {TagInputComponent} from 'ngx-chips';
 import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service';
 import {LanguageStore} from '../../../../store/language/language.store';
-import {BaseMultiEnumComponent} from '../../../base/base-multienum.component';
-import {TagModel} from "ngx-chips/core/accessor";
 import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
 import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
+import { MultiEnumEditFieldComponent } from '../edit/multienum.component';
 
 @Component({
     selector: 'scrm-multienum-filter',
     templateUrl: './multienum.component.html',
     styleUrls: []
 })
-export class MultiEnumFilterFieldComponent extends BaseMultiEnumComponent implements OnInit, OnDestroy {
+export class MultiEnumFilterFieldComponent extends MultiEnumEditFieldComponent implements OnInit, OnDestroy {
 
     @ViewChild('tag') tag: TagInputComponent;
 
@@ -54,7 +54,7 @@ export class MultiEnumFilterFieldComponent extends BaseMultiEnumComponent implem
     ngOnInit(): void {
         this.field.valueList = [];
 
-        if (this.field.criteria.values && this.field.criteria.values.length > 0) {
+        if (!isEmpty(this.field.criteria.values)) {
             this.field.valueList = this.field.criteria.values;
         }
 
@@ -62,48 +62,13 @@ export class MultiEnumFilterFieldComponent extends BaseMultiEnumComponent implem
 
     }
 
-    public onAdd(): void {
+    protected syncSelectedValuesWithForm(): string[] {
+        const selectedValuesValueMap = super.syncSelectedValuesWithForm();
 
-        const value = this.selectedValues.map(option => option.value);
-        this.field.valueList = value;
-        this.field.formControl.setValue(value);
-        this.field.formControl.markAsDirty();
         this.field.criteria.operator = '=';
-        this.field.criteria.values = value;
+        this.field.criteria.values = selectedValuesValueMap;
 
-        return;
-    }
-
-    public onRemove(): void {
-
-        let value = this.selectedValues.map(option => option.value);
-        if (!value) {
-            value = [];
-        }
-
-        this.field.valueList = value;
-        this.field.formControl.setValue(value);
-        this.field.formControl.markAsDirty();
-        this.field.criteria.operator = '=';
-        this.field.criteria.values = value;
-        setTimeout(() => {
-            this.tag.focus(true, true);
-            this.tag.dropdown.show();
-        }, 200);
-    }
-
-    public getPlaceholderLabel(): string {
-        return this.languages.getAppString('LBL_SELECT_ITEM') || '';
-    }
-
-    public selectFirstElement(): void {
-        const filteredElements: TagModel = this.tag.dropdown.items;
-        if (filteredElements.length !== 0) {
-            const firstElement = filteredElements[0];
-            this.selectedValues.push(firstElement);
-            this.onAdd();
-            this.tag.dropdown.hide();
-        }
+        return selectedValuesValueMap;
     }
 
 }
diff --git a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts
index 7327c3ec5d..32264c64cd 100644
--- a/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts
+++ b/core/app/core/src/lib/fields/radioenum/templates/edit/radioenum.component.ts
@@ -60,10 +60,8 @@ export class RadioEnumEditFieldComponent extends BaseEnumComponent {
     ngOnInit(): void {
         super.ngOnInit();
 
-        this.subscribeValueChanges();
-
         if (this.record && this.record.formGroup) {
-            this.formGroup = this.record.formGroup
+            this.formGroup = this.record.formGroup;
         } else {
             this.formGroup = new FormGroup({});
             this.formGroup.addControl(this.field.name, this.field.formControl);
@@ -71,7 +69,7 @@ export class RadioEnumEditFieldComponent extends BaseEnumComponent {
 
     }
 
-    public getId(item: Option) {
+    public getId(item: Option): string {
         return this.field.name + '-' + item.value;
     }
 }