diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js
index <HASH>..<HASH> 100644
--- a/src/components/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -41,7 +41,9 @@ class DefaultLoginForm extends React.Component {
       var fields = null;
       var socialProviders = null;
 
-      if (data && data.form) {
+      if (err) {
+        fields = defaultFields;
+      } else if (data && data.form) {
         fields = data.form.fields;
         if (!this.props.hideSocial) {
           data.accountStores.forEach((accountStore) => {
diff --git a/src/components/RegistrationForm.js b/src/components/RegistrationForm.js
index <HASH>..<HASH> 100644
--- a/src/components/RegistrationForm.js
+++ b/src/components/RegistrationForm.js
@@ -53,13 +53,13 @@ class DefaultRegistrationForm extends React.Component {
       }
     ];
 
-
-
     UserStore.getRegisterViewData((err, data) => {
       var fields = null;
       var socialProviders = null;
 
-      if (data && data.form) {
+      if (err) {
+        fields = defaultFields;
+      } else if (data && data.form) {
         fields = data.form.fields;
         if (!this.props.hideSocial) {
           data.accountStores.forEach((accountStore) => {
fix defaultFields fallback for the Login and Registration form