diff --git a/components/password-prompt.js b/components/password-prompt.js
index d9125bf..78d1b93 100644
--- a/components/password-prompt.js
+++ b/components/password-prompt.js
@@ -102,6 +102,7 @@ export default class PasswordPrompt extends Component {
               onPress={() => {
                 requestHash(this.state.password)
               }}
+              disabled={!this.state.password}
             >
               <AppText style={styles.passwordPromptButtonText}>
                 {labels.title}
diff --git a/components/settings/password-setting.js b/components/settings/password-setting.js
index 0b3a3fb..f8336ec 100644
--- a/components/settings/password-setting.js
+++ b/components/settings/password-setting.js
@@ -80,6 +80,7 @@ export default class PasswordSetting extends Component {
                   requestHash(this.state.changedPassword)
                 }
               }}
+              disabled={this.state.changingPassword && !this.state.changedPassword}
               style={styles.settingsButton}>
               <AppText style={styles.settingsButtonText}>
                 {labels.passwordSettings.changePassword}
@@ -123,6 +124,7 @@ export default class PasswordSetting extends Component {
                 requestHash(this.state.newPassword)
               }
             }}
+            disabled={this.state.enteringNewPassword && !this.state.newPassword}
             style={styles.settingsButton}>
             <AppText style={styles.settingsButtonText}>
               {labels.passwordSettings.setPassword}