diff --git a/src/components/UtilityAccount/index.js b/src/components/UtilityAccount/index.js
index a9eec87ff63b41c5013cfd9d226d7176777a393d..dac0340b0fb5a196abd74c0cf7edbd3db90c6b2d 100644
--- a/src/components/UtilityAccount/index.js
+++ b/src/components/UtilityAccount/index.js
@@ -52,14 +52,22 @@ class UtilityAccount extends Component {
this.props.deleteAccount(this);
}
- renderAddAccountBtn = () => (
-
- )
+ renderAddAccountBtn = () => {
+ let isDisabled = !(this.state.form.account_number);
+ if (this.state.form.utility === 'national_grid_gas') {
+ isDisabled = !(this.state.form.account_number && this.state.form.access_code)
+ && !(this.state.form.account_number && this.state.form.username && this.state.form.password);
+ }
+ return (
+
+ );
+ }
renderFetchAndDownloadBtn = () => {
const { downloadURL } = this.state;