2 files changed, 10 insertions, 10 deletions

diff --git a/app/components/Account.js b/app/components/Account.js
index b592bbd850..06947be7f2 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -23,8 +23,8 @@ export default class Account extends Component {
   onLogout = () => this.props.onLogout();
 
   render(): React.Element<*> {
-    let paidUntil = moment(this.props.account.paidUntil);
-    let formattedAccountId = formatAccount(this.props.account.account || '');
+    const paidUntil = moment(this.props.account.paidUntil);
+    const formattedAccountId = formatAccount(this.props.account.accountNumber || '');
     const formattedPaidUntil = paidUntil.format('hA, D MMMM YYYY').toUpperCase();
     const isOutOfTime = paidUntil.isSameOrBefore(moment());
 
diff --git a/app/components/Login.js b/app/components/Login.js
index dc0f9e9baa..0427832973 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -28,9 +28,9 @@ export default class Login extends Component {
   onFocus = () => this.setState({ isActive: true });
   onBlur = () => this.setState({ isActive: false });
   onLogin = () => {
-    const { account } = this.props.account;
-    if(account && account.length > 0) {
-      this.props.onLogin(account);
+    const { accountNumber } = this.props.account;
+    if(accountNumber && accountNumber.length > 0) {
+      this.props.onLogin(accountNumber);
     }
   }
 
@@ -90,10 +90,10 @@ export default class Login extends Component {
     return classes.join(' ');
   }
 
-  submitClass(s: LoginState, account: ?string): string {
+  submitClass(s: LoginState, accountNumber: ?string): string {
     const classes = ['login-form__submit'];
 
-    if(account && account.length > 0) {
+    if(accountNumber && accountNumber.length > 0) {
       classes.push('login-form__submit--active');
     }
 
@@ -114,7 +114,7 @@ export default class Login extends Component {
   }
 
   render(): React.Element<*> {
-    const { account, status, error } = this.props.account;
+    const { accountNumber, status, error } = this.props.account;
     const title = this.formTitle(status);
     const subtitle = this.formSubtitle(status, error);
 
@@ -129,7 +129,7 @@ export default class Login extends Component {
 
     const inputWrapClass = this.inputWrapClass(status);
     const footerClass = this.footerClass(status);
-    const submitClass = this.submitClass(status, account);
+    const submitClass = this.submitClass(status, accountNumber);
 
     const autoFocusRef = input => {
       if(isFailed && input) {
@@ -181,7 +181,7 @@ export default class Login extends Component {
                     onBlur={ this.onBlur }
                     onChange={ this.onInputChange }
                     onEnter={ this.onLogin }
-                    value={ account || '' }
+                    value={ accountNumber || '' }
                     disabled={ isConnecting }
                     autoFocus={ true }
                     ref={ autoFocusRef } />