diff --git a/src/CONST.js b/src/CONST.js
index 59403775effa..47effb8a5b2c 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -418,6 +418,7 @@ const CONST = {
     },
     DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
     DEFAULT_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
+    DEFAULT_CLOSE_ACCOUNT_DATA: {error: '', success: '', isLoading: false},
     APP_STATE: {
         ACTIVE: 'active',
         BACKGROUND: 'background',
diff --git a/src/libs/actions/CloseAccount.js b/src/libs/actions/CloseAccount.js
index a42db97529ef..d8091f25bdb2 100644
--- a/src/libs/actions/CloseAccount.js
+++ b/src/libs/actions/CloseAccount.js
@@ -1,5 +1,6 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
+import CONST from '../../CONST';
 
 /**
  * Clear CloseAccount error message to hide modal
@@ -8,7 +9,15 @@ function clearError() {
     Onyx.merge(ONYXKEYS.CLOSE_ACCOUNT, {error: ''});
 }
 
+/**
+ * Set default Onyx data
+ */
+function setDefaultData() {
+    Onyx.merge(ONYXKEYS.CLOSE_ACCOUNT, {...CONST.DEFAULT_CLOSE_ACCOUNT_DATA});
+}
+
 export {
     // eslint-disable-next-line import/prefer-default-export
     clearError,
+    setDefaultData,
 };
diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index 22baa8d66a36..f190cb67ece9 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -18,6 +18,9 @@ import withLocalize, {withLocalizePropTypes} from '../../../components/withLocal
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 import * as CloseAccount from '../../../libs/actions/CloseAccount';
 import ONYXKEYS from '../../../ONYXKEYS';
+import OfflineIndicator from '../../../components/OfflineIndicator';
+import {withNetwork} from '../../../components/OnyxProvider';
+import networkPropTypes from '../../../components/networkPropTypes';
 
 const propTypes = {
     /** Onyx Props */
@@ -37,6 +40,9 @@ const propTypes = {
         email: PropTypes.string.isRequired,
     }).isRequired,
 
+    /** Information about the network */
+    network: networkPropTypes.isRequired,
+
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
@@ -110,9 +116,11 @@ class CloseAccountPage extends Component {
                         text={this.props.translate('closeAccountPage.closeAccount')}
                         isLoading={this.props.closeAccount.isLoading}
                         onPress={() => User.closeAccount(this.state.reasonForLeaving)}
-                        isDisabled={Str.removeSMSDomain(userEmailOrPhone).toLowerCase() !== this.state.phoneOrEmail.toLowerCase()}
+                        isDisabled={Str.removeSMSDomain(userEmailOrPhone).toLowerCase() !== this.state.phoneOrEmail.toLowerCase() || this.props.network.isOffline}
                         style={[styles.mt5]}
                     />
+                    {!this.props.isSmallScreenWidth
+                        && <OfflineIndicator containerStyles={[styles.mt2]} />}
                 </ScrollView>
                 <ConfirmModal
                     title={this.props.translate('closeAccountPage.closeAccountError')}
@@ -147,6 +155,7 @@ CloseAccountPage.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withWindowDimensions,
+    withNetwork(),
     withOnyx({
         closeAccount: {
             key: ONYXKEYS.CLOSE_ACCOUNT,
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 1f8130639ceb..8e67917f53ee 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -22,6 +22,8 @@ import OfflineIndicator from '../../components/OfflineIndicator';
 import {withNetwork} from '../../components/OnyxProvider';
 import networkPropTypes from '../../components/networkPropTypes';
 import * as ErrorUtils from '../../libs/ErrorUtils';
+import DotIndicatorMessage from '../../components/DotIndicatorMessage';
+import * as CloseAccount from '../../libs/actions/CloseAccount';
 
 const propTypes = {
     /** Should we dismiss the keyboard when transitioning away from the page? */
@@ -41,6 +43,11 @@ const propTypes = {
         isLoading: PropTypes.bool,
     }),
 
+    closeAccount: PropTypes.shape({
+        /** Message to display when user successfully closed their account */
+        success: PropTypes.string,
+    }),
+
     /** Props to detect online status */
     network: networkPropTypes.isRequired,
 
@@ -53,6 +60,7 @@ const propTypes = {
 
 const defaultProps = {
     account: {},
+    closeAccount: {},
     blurOnSubmit: false,
 };
 
@@ -124,6 +132,11 @@ class LoginForm extends React.Component {
             return;
         }
 
+        // If account was closed and have success message in Onyx, we clear it here
+        if (!_.isEmpty(this.props.closeAccount.success)) {
+            CloseAccount.setDefaultData();
+        }
+
         const login = this.state.login.trim();
         if (!login) {
             this.setState({formError: 'common.pleaseEnterEmailOrPhoneNumber'});
@@ -176,6 +189,11 @@ class LoginForm extends React.Component {
                         {this.props.account.success}
                     </Text>
                 )}
+                {!_.isEmpty(this.props.closeAccount.success) && (
+
+                    // DotIndicatorMessage mostly expects onyxData errors, so we need to mock an object so that the messages looks similar to prop.account.errors
+                    <DotIndicatorMessage style={[styles.mv2]} type="success" messages={{0: this.props.closeAccount.success}} />
+                )}
                 { // We need to unmount the submit button when the component is not visible so that the Enter button
                   // key handler gets unsubscribed and does not conflict with the Password Form
                     this.props.isVisible && (
@@ -203,6 +221,7 @@ LoginForm.defaultProps = defaultProps;
 export default compose(
     withOnyx({
         account: {key: ONYXKEYS.ACCOUNT},
+        closeAccount: {key: ONYXKEYS.CLOSE_ACCOUNT},
     }),
     withWindowDimensions,
     withLocalize,