diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx
index 69a655c87..e21fce7ca 100644
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx
+++ b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx
@@ -7,20 +7,20 @@ class CheckBoxComponent extends Component {
         super(props);
     }
 
-    handleChange = (e, {value}) => {
-        this.props.handleChange(this.props.id, value);
+    handleChange = (e) => {
+        this.props.handleChange(this.props.id, 1 - this.props.value);
     };
 
     render() {
         return (
             <Switch
                 key={this.props.field}
-                value={this.props.value}
+                value={this.props.field}
                 onClick={this.handleChange}
-                selected={this.props.value === 1 ? true : false}
+                disabled={this.props.disabled}
+                selected={this.props.value ? true : false}
                 appearance="checkbox"
-            >
-            </Switch>
+            ></Switch>
         );
     }
 }
diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx
index 5668afdca..85ae0036e 100644
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx
+++ b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx
@@ -20,7 +20,7 @@ class TextComponent extends Component {
                 disabled={this.props.disabled}
                 value={this.props.value}
                 onChange={this.handleChange}
-                type={this.props.encrypted === true ? 'password' : 'text'}
+                type={this.props.encrypted ? 'password' : 'text'}
             />
         );
     }