diff --git a/WordPress/src/main/java/org/wordpress/android/networking/ConnectionChangeReceiver.java b/WordPress/src/main/java/org/wordpress/android/networking/ConnectionChangeReceiver.java
index e2b6a9faf46a..ea341364e28c 100644
--- a/WordPress/src/main/java/org/wordpress/android/networking/ConnectionChangeReceiver.java
+++ b/WordPress/src/main/java/org/wordpress/android/networking/ConnectionChangeReceiver.java
@@ -56,4 +56,8 @@ public static ConnectionChangeReceiver getInstance(){
         }
         return sInstance;
     }
+
+    public static EventBus getEventBus() {
+        return EventBus.getDefault();
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SiteCreationActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SiteCreationActivity.java
index c0ab30d1d1cb..b9d474cbf433 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SiteCreationActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SiteCreationActivity.java
@@ -115,7 +115,8 @@ private void launchHelpshift(HelpshiftHelper.Tag origin) {
     private enum SiteCreationBackStackMode {
         NORMAL,
         MODAL,
-        FINISH_OK
+        FINISH_OK,
+        FINISH_DISMISS
     }
 
     private SiteCreationBackStackMode getSiteCreationBackStackMode() {
@@ -123,14 +124,14 @@ private SiteCreationBackStackMode getSiteCreationBackStackMode() {
                 (SiteCreationCreatingFragment) getSupportFragmentManager()
                         .findFragmentByTag(SiteCreationCreatingFragment.TAG);
 
-        if (siteCreationCreatingFragment == null) {
+        if (siteCreationCreatingFragment == null || siteCreationCreatingFragment.canGoBack()) {
             return SiteCreationBackStackMode.NORMAL;
         } else if (siteCreationCreatingFragment.isInModalMode()) {
             return SiteCreationBackStackMode.MODAL;
         } else if (siteCreationCreatingFragment.isCreationSucceeded()) {
             return SiteCreationBackStackMode.FINISH_OK;
         } else {
-            return SiteCreationBackStackMode.NORMAL;
+            return SiteCreationBackStackMode.FINISH_DISMISS;
         }
     }
 
@@ -147,6 +148,9 @@ public void onBackPressed() {
                 setResult(RESULT_OK);
                 finish();
                 break;
+            case FINISH_DISMISS:
+                finish();
+                break;
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationBaseFormFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationBaseFormFragment.java
index 299dcbb56972..a1451e02b75d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationBaseFormFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationBaseFormFragment.java
@@ -78,10 +78,13 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         }
     }
 
-    protected void showHomeButton(boolean visible) {
+    protected void showHomeButton(boolean visible, boolean isCloseButton) {
         ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(visible);
+            if (isCloseButton) {
+                actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java
index f7ac1cfd19dd..017891532f1a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java
@@ -16,9 +16,11 @@
 import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.ui.accounts.signup.SiteCreationService.SiteCreationState;
+import org.wordpress.android.ui.accounts.signup.SiteCreationService.SiteCreationStep;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.AutoForeground.ServiceEventConnection;
+import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.URLFilteredWebViewClient;
 
 import java.util.HashMap;
@@ -31,8 +33,6 @@ public class SiteCreationCreatingFragment extends SiteCreationBaseFormFragment<S
     private static final String ARG_SITE_SLUG = "ARG_SITE_SLUG";
     private static final String ARG_SITE_THEME_ID = "ARG_SITE_THEME_ID";
 
-    private static final String KEY_IN_MODAL_MODE = "KEY_IN_MODAL_MODE";
-    private static final String KEY_CREATION_FINISHED = "KEY_CREATION_FINISHED";
     private static final String KEY_WEBVIEW_LOADED_IN_TIME = "KEY_WEBVIEW_LOADED_IN_TIME";
     private static final String KEY_TRACKED_SUCCESS = "KEY_TRACKED_SUCCESS";
 
@@ -48,19 +48,32 @@ public class SiteCreationCreatingFragment extends SiteCreationBaseFormFragment<S
     private TextView[] mLabels;
 
     private boolean mTrackedSuccess;
-    private boolean mInModalMode;
-    private boolean mCreationSucceeded;
     private boolean mWebViewLoadedInTime;
-    private int mNewSiteLocalId;
+    int mNewSiteLocalId;
 
     private PreviewWebViewClient mPreviewWebViewClient;
 
     public boolean isInModalMode() {
-        return mInModalMode;
+        SiteCreationState state = SiteCreationService.getState();
+        return state != null && state.isInProgress();
     }
 
     public boolean isCreationSucceeded() {
-        return mCreationSucceeded;
+        SiteCreationState state = SiteCreationService.getState();
+        return state != null && SiteCreationService.getState().getStep() == SiteCreationStep.SUCCESS;
+    }
+
+    public boolean canGoBack() {
+        SiteCreationState state = SiteCreationService.getState();
+        if (state == null) {
+            return true;
+        }
+
+        if (state.getStep() == SiteCreationStep.FAILURE) {
+            state = (SiteCreationState) state.getPayload();
+        }
+
+        return !state.isAfterCreation();
     }
 
     public static SiteCreationCreatingFragment newInstance(String siteTitle, String siteTagline, String siteSlug,
@@ -130,11 +143,8 @@ public void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             // on first appearance start the Service to perform the site creation
-            mInModalMode = true;
             createSite();
         } else {
-            mInModalMode = savedInstanceState.getBoolean(KEY_IN_MODAL_MODE, false);
-            mCreationSucceeded = savedInstanceState.getBoolean(KEY_CREATION_FINISHED, false);
             mWebViewLoadedInTime = savedInstanceState.getBoolean(KEY_WEBVIEW_LOADED_IN_TIME, false);
             mTrackedSuccess = savedInstanceState.getBoolean(KEY_TRACKED_SUCCESS, false);
         }
@@ -144,7 +154,7 @@ public void onCreate(Bundle savedInstanceState) {
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        showHomeButton(!mInModalMode);
+        showHomeButton(!isInModalMode(), false);
 
         if (savedInstanceState == null) {
             AnalyticsTracker.track(AnalyticsTracker.Stat.SITE_CREATION_CREATING_VIEWED);
@@ -171,13 +181,11 @@ public void onPause() {
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
-        outState.putBoolean(KEY_IN_MODAL_MODE, mInModalMode);
-        outState.putBoolean(KEY_CREATION_FINISHED, mCreationSucceeded);
         outState.putBoolean(KEY_WEBVIEW_LOADED_IN_TIME, mWebViewLoadedInTime);
         outState.putBoolean(KEY_TRACKED_SUCCESS, mTrackedSuccess);
     }
 
-    private void createSite() {
+    void createSite() {
         String siteTitle = getArguments().getString(ARG_SITE_TITLE);
         String siteTagline = getArguments().getString(ARG_SITE_TAGLINE);
         String siteSlug = getArguments().getString(ARG_SITE_SLUG);
@@ -185,7 +193,7 @@ private void createSite() {
         SiteCreationService.createSite(getContext(), siteTitle, siteTagline, siteSlug, themeId);
     }
 
-    private void retryFromState(SiteCreationState retryFromState, long newSiteRemoteId) {
+    void retryFromState(SiteCreationState retryFromState, long newSiteRemoteId) {
         String siteTagline = getArguments().getString(ARG_SITE_TAGLINE);
         String themeId = getArguments().getString(ARG_SITE_THEME_ID);
         SiteCreationService.retryFromState(getContext(), retryFromState, newSiteRemoteId, siteTagline, themeId);
@@ -217,7 +225,7 @@ private PreviewWebViewClient loadWebview() {
     }
 
     private static class PreviewWebViewClient extends URLFilteredWebViewClient {
-        private boolean mIsPageFinished;
+        boolean mIsPageFinished;
 
         PreviewWebViewClient(String siteAddress) {
             super(siteAddress);
@@ -245,9 +253,17 @@ private void disableUntil(@IdRes int textViewId) {
         }
     }
 
-    private void setModalMode(boolean inModalMode) {
-        mInModalMode = inModalMode;
-        showHomeButton(!mInModalMode);
+    private void configureBackButton() {
+        SiteCreationState currentState = SiteCreationService.getState();
+
+        SiteCreationState failedOnState = null;
+        if (currentState != null && currentState.getStep() == SiteCreationStep.FAILURE) {
+            failedOnState = (SiteCreationState) currentState.getPayload();
+        }
+
+        boolean isInModal = currentState != null && currentState.isInProgress();
+        boolean failedAfterCreation = failedOnState != null && failedOnState.isAfterCreation();
+        showHomeButton(!isInModal, failedAfterCreation);
     }
 
     private void configureImage(boolean hasFailure) {
@@ -269,8 +285,8 @@ public void onClick(View view) {
                 if (failedState.isTerminal()) {
                     throw new RuntimeException("Internal inconsistency: Cannot resume site creation from "
                             + failedState.getStepName());
-                } else if (failedState.getStep() == SiteCreationService.SiteCreationStep.IDLE
-                        || failedState.getStep() == SiteCreationService.SiteCreationStep.NEW_SITE) {
+                } else if (failedState.getStep() == SiteCreationStep.IDLE
+                        || failedState.getStep() == SiteCreationStep.NEW_SITE) {
                     createSite();
                 } else {
                     retryFromState(failedState, (long) failedState.getPayload());
@@ -287,6 +303,8 @@ public void onSiteCreationStateUpdated(SiteCreationState event) {
         mProgressContainer.setVisibility(View.VISIBLE);
         mErrorContainer.setVisibility(View.GONE);
 
+        configureBackButton();
+
         switch (event.getStep()) {
             case IDLE:
                 disableUntil(0);
@@ -309,11 +327,11 @@ public void onSiteCreationStateUpdated(SiteCreationState event) {
                 configureImage(false);
                 break;
             case FAILURE:
-                setModalMode(false);
                 configureImage(true);
                 mProgressContainer.setVisibility(View.GONE);
                 mErrorContainer.setVisibility(View.VISIBLE);
                 handleFailure((SiteCreationState) event.getPayload());
+                NetworkUtils.checkConnection(getContext());
                 break;
             case PRELOAD:
                 disableUntil(R.id.site_creation_creating_preparing_frontend);
@@ -321,9 +339,7 @@ public void onSiteCreationStateUpdated(SiteCreationState event) {
                 mPreviewWebViewClient = loadWebview();
                 break;
             case SUCCESS:
-                mCreationSucceeded = true;
                 mNewSiteLocalId = (Integer) event.getPayload();
-                setModalMode(false);
 
                 if (mPreviewWebViewClient == null) {
                     // Apparently view got rotated while at the final so, just reconfigure the WebView.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainAdapter.java
index 14fadbef2a49..e2cee574f07b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainAdapter.java
@@ -1,6 +1,8 @@
 package org.wordpress.android.ui.accounts.signup;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -77,7 +79,13 @@ public void afterTextChanged(final Editable editable) {
                     mDebouncer.debounce(Void.class, new Runnable() {
                         @Override
                         public void run() {
-                            mOnAdapterListener.onKeywordsChange(text);
+                            // post the action on an properly initialised Handler so UI thread operations can succeed
+                            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mOnAdapterListener.onKeywordsChange(text);
+                                }
+                            });
                         }
                     }, GET_SUGGESTIONS_INTERVAL_MS, TimeUnit.MILLISECONDS);
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainLoaderFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainLoaderFragment.java
index 32d54dc337c2..4eb1f01beba4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainLoaderFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationDomainLoaderFragment.java
@@ -13,6 +13,7 @@
 import org.wordpress.android.fluxc.store.SiteStore.OnSuggestedDomains;
 import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsPayload;
 import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.NetworkUtils;
 
 import javax.inject.Inject;
 
@@ -72,6 +73,9 @@ public void onDestroy() {
     }
 
     public void load(String keywords) {
+        // notify if no connectivity but continue anyway
+        NetworkUtils.checkConnection(getActivity());
+
         postUpdate(new DomainSuggestionEvent(DomainUpdateStep.UPDATING, keywords, null));
 
         SuggestDomainsPayload payload = new SuggestDomainsPayload(keywords, true, true, false, 20);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java
index ef88bacb1043..3eb12010a9a9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java
@@ -69,7 +69,7 @@ public enum SiteCreationStep {
     }
 
     public static class SiteCreationState implements AutoForeground.ServiceState {
-        private final SiteCreationStep mStep;
+        private @NonNull final SiteCreationStep mStep;
         private final Object payload;
 
         SiteCreationState(@NonNull SiteCreationStep step, @Nullable Object payload) {
@@ -77,6 +77,7 @@ public static class SiteCreationState implements AutoForeground.ServiceState {
             this.payload = payload;
         }
 
+        @NonNull
         SiteCreationStep getStep() {
             return mStep;
         }
@@ -109,6 +110,10 @@ public boolean isTerminal() {
         public String getStepName() {
             return mStep.name();
         }
+
+        boolean isAfterCreation() {
+            return mStep.ordinal() > SiteCreationStep.NEW_SITE.ordinal();
+        }
     }
 
     private static class SiteCreationNotification {
@@ -183,6 +188,10 @@ public static void clearSiteCreationServiceState() {
         clearServiceState(SiteCreationState.class);
     }
 
+    public static SiteCreationState getState() {
+        return getState(SiteCreationState.class);
+    }
+
     public SiteCreationService() {
         super(new SiteCreationState(SiteCreationStep.IDLE, null));
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeAdapter.java
index 2d05320ab544..b06b3338ca77 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeAdapter.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.accounts.signup;
 
 import android.content.Context;
+import android.support.annotation.StringRes;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,15 +22,18 @@ public class SiteCreationThemeAdapter extends RecyclerView.Adapter<RecyclerView.
 
     private boolean mIsLoading;
     private List<ThemeModel> mThemes;
+    private @StringRes int mErrorMessage;
     private SiteCreationListener mSiteCreationListener;
 
     public static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        public final View progressContainer;
         public final View progress;
         public final TextView label;
 
         HeaderViewHolder(View itemView) {
             super(itemView);
-            this.progress = itemView.findViewById(R.id.progress_container);
+            this.progressContainer = itemView.findViewById(R.id.progress_container);
+            this.progress = itemView.findViewById(R.id.progress_bar);
             this.label = (TextView) itemView.findViewById(R.id.progress_label);
         }
     }
@@ -52,9 +56,10 @@ public SiteCreationThemeAdapter(Context context, SiteCreationListener siteCreati
         mSiteCreationListener = siteCreationListener;
     }
 
-    public void setData(boolean isLoading, List<ThemeModel> themes) {
+    public void setData(boolean isLoading, List<ThemeModel> themes, @StringRes int errorMessage) {
         mIsLoading = isLoading;
         mThemes = themes;
+        mErrorMessage = errorMessage;
         notifyDataSetChanged();
     }
 
@@ -77,10 +82,13 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
 
         if (viewType == VIEW_TYPE_HEADER) {
             final HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
+            headerViewHolder.progressContainer.setVisibility(mIsLoading || mThemes == null ? View.VISIBLE : View.GONE);
             headerViewHolder.progress.setVisibility(mIsLoading ? View.VISIBLE : View.GONE);
             if (!mIsLoading && mThemes == null) {
                 // this is an error situation so, show an error
-                headerViewHolder.label.setText(R.string.error_generic);
+                headerViewHolder.label.setText(mErrorMessage);
+            } else {
+                headerViewHolder.label.setText(null);
             }
         } else {
             final ThemeModel theme = getItem(position);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeFragment.java
index 56dc2fd9ae61..f7da65a36d0a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeFragment.java
@@ -105,13 +105,16 @@ public void onThemeLoadingUpdated(OnThemeLoadingUpdated event) {
 
         switch (event.getPhase()) {
             case UPDATING:
-                mSiteCreationThemeAdapter.setData(true, null);
+                mSiteCreationThemeAdapter.setData(true, null, 0);
                 break;
             case ERROR:
-                mSiteCreationThemeAdapter.setData(false, null);
+                mSiteCreationThemeAdapter.setData(false, null, R.string.error_generic);
+                break;
+            case ERROR_NO_CONNECTIVITY:
+                mSiteCreationThemeAdapter.setData(false, null, R.string.error_generic_network);
                 break;
             case FINISHED:
-                mSiteCreationThemeAdapter.setData(false, getThemes());
+                mSiteCreationThemeAdapter.setData(false, getThemes(), 0);
                 break;
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeLoaderFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeLoaderFragment.java
index e096418ded6c..6341531d7670 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeLoaderFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationThemeLoaderFragment.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.accounts.signup;
 
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
 import org.greenrobot.eventbus.EventBus;
@@ -10,7 +11,10 @@
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.generated.ThemeActionBuilder;
 import org.wordpress.android.fluxc.store.ThemeStore;
+import org.wordpress.android.networking.ConnectionChangeReceiver;
+import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent;
 import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.NetworkUtils;
 
 import javax.inject.Inject;
 
@@ -20,7 +24,8 @@ public class SiteCreationThemeLoaderFragment extends Fragment {
     public enum ThemesUpdateState {
         UPDATING,
         FINISHED,
-        ERROR
+        ERROR,
+        ERROR_NO_CONNECTIVITY
     }
 
     static class OnThemeLoadingUpdated {
@@ -40,36 +45,68 @@ ThemesUpdateState getPhase() {
     // need to inject it even though we're not using it directly, otherwise we can't listen for its event responses
     @Inject ThemeStore mThemeStore;
 
+    @Nullable
+    private OnThemeLoadingUpdated getState() {
+        return EventBus.getDefault().getStickyEvent(OnThemeLoadingUpdated.class);
+    }
+
     private void postUpdate(ThemesUpdateState state) {
         EventBus.getDefault().postSticky(new OnThemeLoadingUpdated(state));
     }
 
+    private void update() {
+        postUpdate(ThemesUpdateState.UPDATING);
+        mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction());
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getActivity().getApplication()).component().inject(this);
 
-        postUpdate(ThemesUpdateState.UPDATING);
-
+        ConnectionChangeReceiver.getEventBus().register(this);
         mDispatcher.register(this);
-        mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction());
+
+        update();
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         mDispatcher.unregister(this);
+        ConnectionChangeReceiver.getEventBus().unregister(this);
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(ConnectionChangeEvent event) {
+        OnThemeLoadingUpdated onThemeLoadingUpdated = getState();
+        if (isAdded()
+                && event.isConnected()
+                && onThemeLoadingUpdated != null
+                && onThemeLoadingUpdated.getPhase() == ThemesUpdateState.ERROR_NO_CONNECTIVITY) {
+            update();
+        }
     }
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onThemesChanged(ThemeStore.OnWpComThemesChanged event) {
-        mDispatcher.unregister(this);
-
         if (event.isError()) {
-            AppLog.e(AppLog.T.THEMES, "Error fetching themes: " + event.error.message);
-            postUpdate(ThemesUpdateState.ERROR);
+            if (NetworkUtils.isNetworkAvailable(getContext())) {
+                mDispatcher.unregister(this);
+                ConnectionChangeReceiver.getEventBus().unregister(this);
+
+                AppLog.e(AppLog.T.THEMES, "Error fetching themes: " + event.error.message);
+                postUpdate(ThemesUpdateState.ERROR);
+            } else {
+                AppLog.e(AppLog.T.THEMES, "Error fetching themes: " + event.error.message
+                        + ". Seems connectivity is off though so, will try again when back online");
+                postUpdate(ThemesUpdateState.ERROR_NO_CONNECTIVITY);
+            }
         } else {
+            mDispatcher.unregister(this);
+            ConnectionChangeReceiver.getEventBus().unregister(this);
+
             AppLog.d(AppLog.T.THEMES, "WordPress.com Theme fetch successful!");
             postUpdate(ThemesUpdateState.FINISHED);
         }
diff --git a/WordPress/src/main/res/layout/site_creation_theme_header.xml b/WordPress/src/main/res/layout/site_creation_theme_header.xml
index ac2ee28b43f8..cf892e9db685 100644
--- a/WordPress/src/main/res/layout/site_creation_theme_header.xml
+++ b/WordPress/src/main/res/layout/site_creation_theme_header.xml
@@ -46,6 +46,7 @@
         tools:visibility="visible">
 
         <ProgressBar
+            android:id="@+id/progress_bar"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="center_horizontal"/>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 596233861e0c..d4e047e501e6 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2135,7 +2135,7 @@
     <string name="site_creation_label_site_details">Tell us more about what you\'re creating. What\'s the title and tagline?</string>
     <string name="site_creation_label_domain_selection_title">Step 4 of 4</string>
     <string name="site_creation_label_domain_selection">Pick an available \"yourname.wordpress.com\" address to let people find you on the web.</string>
-    <string name="site_creation_domain_keywords_hint">Type to get more suggestions</string>
+    <string name="site_creation_domain_keywords_hint">Type a keyword for more ideas</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="site_creation_title_hint">Site title</string>
     <string name="site_creation_tagline_hint">Site tagline (optional)</string>
diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle
index ef27b0efecd6..8495eb4fffba 100644
--- a/libs/login/WordPressLoginFlow/build.gradle
+++ b/libs/login/WordPressLoginFlow/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    implementation ('org.wordpress:utils:1.20.0-beta5') {
+    implementation ('org.wordpress:utils:1.20.0-beta6') {
         exclude group: "com.mcxiaoke.volley"
     }
 
diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
index 24420cab96b4..73e70e36b97c 100644
--- a/libs/utils/WordPressUtils/build.gradle
+++ b/libs/utils/WordPressUtils/build.gradle
@@ -33,7 +33,7 @@ android {
     buildToolsVersion '26.0.2'
 
     defaultConfig {
-        versionName "1.20.0-beta5"
+        versionName "1.20.0-beta6"
         minSdkVersion 15
         targetSdkVersion 25
     }
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java
index 6c98fd80a9a2..14d462b6ee59 100644
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java
+++ b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java
@@ -89,8 +89,14 @@ public boolean isForeground() {
         return mIsForeground;
     }
 
-    protected StateClass getState() {
-        return EventBus.getDefault().getStickyEvent(mStateClass);
+    @Nullable
+    private StateClass getState() {
+        return getState(mStateClass);
+    }
+
+    @Nullable
+    protected static <StateClass> StateClass getState(Class<StateClass> stateClass) {
+        return EventBus.getDefault().getStickyEvent(stateClass);
     }
 
     @Nullable