diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
index b50af0ece61e4308aac817eb06abd32f9849444b..9e8f7b8d7fb509b58c89d31589c944e240a7d856 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
@@ -25,7 +25,7 @@ class AccountRewritePhrase extends Component {
 
     // If we're importing, we show the current address generated by the current
     // recovery phrase
-    if (isImport) {
+    if (isImport && value) {
       this.setState({ isLoading: true });
       this.handleSavePhrase();
     }
diff --git a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
index 104b107c0287a4fe74443fd4034396852e5db073..0351f482a488270d27c8c0bbe259686170527b24 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
@@ -37,6 +37,7 @@ class CreateAccount extends Component {
         params: { step }
       }
     } = this.props;
+    createAccountStore.clear();
     createAccountStore.setIsImport(!createAccountStore.isImport);
 
     // If we were further in the account creation, go back to step 1