diff --git a/src/containers/WaitForSettings/WaitForSettings.js b/src/containers/WaitForSettings/WaitForSettings.js
index 3737698..e240731 100644
--- a/src/containers/WaitForSettings/WaitForSettings.js
+++ b/src/containers/WaitForSettings/WaitForSettings.js
@@ -7,17 +7,31 @@ import { getPluginSettingsForZoneId } from '../../selectors/pluginSettings';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import { getZoneAnalyticsForZoneId } from '../../selectors/zoneAnalytics';
 import { getAllZoneSettingsForZoneId } from '../../selectors/zoneSettings';
-import { CLOUDFLARE_ADD_SITE_PAGE } from '../../constants/UrlPaths.js';
+import { isDNSPageEnabled } from '../../selectors/config';
+import { push } from 'react-router-redux';
+import { Link } from 'react-router';
+import {
+  CLOUDFLARE_ADD_SITE_PAGE,
+  DOMAINS_OVERVIEW_PAGE
+} from '../../constants/UrlPaths.js';
 
 class WaitForSettings extends Component {
+  handleClick(path) {
+    let { dispatch } = this.props;
+    dispatch(push(path));
+  }
+
   render() {
     let {
       activeZone,
       zoneSettings,
       zonePluginSettings,
-      zoneAnalytics
+      zoneAnalytics,
+      settings,
+      pluginSettings,
+      analytics,
+      config
     } = this.props;
-    let { settings, pluginSettings, analytics } = this.props;
     const { formatMessage } = this.props.intl;
 
     let isSettingsLoaded = true;
@@ -51,9 +65,16 @@ class WaitForSettings extends Component {
       isPluginSettingsLoaded &&
       isAnalyticsLoaded;
 
-    let link = (
-      <a href={CLOUDFLARE_ADD_SITE_PAGE} target="_blank">Cloudflare</a>
+    var link = (
+      <Link href={CLOUDFLARE_ADD_SITE_PAGE} target="_blank">Cloudflare</Link>
     );
+    if (isDNSPageEnabled(config)) {
+      link = (
+        <Link onClick={() => this.handleClick(DOMAINS_OVERVIEW_PAGE)}>
+          <FormattedMessage id="container.dnsManagementPage.title" />
+        </Link>
+      );
+    }
 
     return (
       <div>
@@ -85,7 +106,8 @@ function mapStateToProps(state) {
     activeZone: state.activeZone,
     zoneSettings: state.zoneSettings,
     zonePluginSettings: state.pluginSettings,
-    zoneAnalytics: state.zoneAnalytics
+    zoneAnalytics: state.zoneAnalytics,
+    config: state.config
   };
 }
 export default injectIntl(connect(mapStateToProps)(WaitForSettings));