diff --git a/components/common/app-switch.js b/components/common/app-switch.js
index 71d5262..3cb30e6 100644
--- a/components/common/app-switch.js
+++ b/components/common/app-switch.js
@@ -8,7 +8,7 @@ import { Containers } from '../../styles/redesign'
 
 const AppSwitch = ({ onToggle, text, value }) => {
   return (
-    <View style={styles.line}>
+    <View style={styles.container}>
       <View style={styles.textContainer}>
         <AppText>{text}</AppText>
       </View>
@@ -24,7 +24,7 @@ AppSwitch.propTypes = {
 }
 
 const styles = StyleSheet.create({
-  line: {
+  container: {
     ...Containers.rowContainer
   },
   switch: {
diff --git a/components/common/button.js b/components/common/button.js
index 46c5838..2e98588 100644
--- a/components/common/button.js
+++ b/components/common/button.js
@@ -6,13 +6,18 @@ import AppText from './app-text'
 
 import { Colors, Fonts, Spacing } from '../../styles/redesign'
 
-const Button = ({ children, isCTA, isSmall, onPress, testID }) => {
+const Button = ({ children, isCTA, isSmall, onPress, testID, ...props }) => {
   const buttonStyle = isCTA ? styles.cta : styles.regular
   const textCTA = isCTA ? styles.buttonTextBold : styles.buttonTextRegular
   const textStyle = [ textCTA, isSmall ? textSmall : text]
 
   return (
-    <TouchableOpacity onPress={onPress} style={buttonStyle} testID={testID}>
+    <TouchableOpacity
+      onPress={onPress}
+      style={buttonStyle}
+      testID={testID}
+      {...props}
+    >
       <AppText style={textStyle}>{children}</AppText>
     </TouchableOpacity>
   )
diff --git a/components/settings/shared/confirm-with-password.js b/components/settings/shared/confirm-with-password.js
index 23bd5a4..ad58313 100644
--- a/components/settings/shared/confirm-with-password.js
+++ b/components/settings/shared/confirm-with-password.js
@@ -75,7 +75,11 @@ export default class ConfirmWithPassword extends Component {
           <Button onPress={this.props.onCancel}>
             {shared.cancel}
           </Button>
-          <Button isCTA={isPassword} onPress={this.initPasswordCheck}>
+          <Button
+            disabled={!isPassword}
+            isCTA={isPassword}
+            onPress={this.initPasswordCheck}
+          >
             {shared.confirmToProceed}
           </Button>
         </View>