diff --git a/components/app-core/frontend/src/view/navbar/avatar/account-actions/account-actions.html b/components/app-core/frontend/src/view/navbar/avatar/account-actions/account-actions.html
index 7089fc9c14..884def11eb 100644
--- a/components/app-core/frontend/src/view/navbar/avatar/account-actions/account-actions.html
+++ b/components/app-core/frontend/src/view/navbar/avatar/account-actions/account-actions.html
@@ -11,7 +11,7 @@
 
   <div class="actions">
     <span class="action">
-    <a class="btn-border-less" href="#/account/settings">
+    <a class="btn-border-less" href="#!/account/settings">
       <i class="material-icons">info_outline</i>
       <div translate>
         About
diff --git a/components/cloud-foundry/frontend/i18n/en_US/errors.json b/components/cloud-foundry/frontend/i18n/en_US/errors.json
index 8846ca9ad1..a9ae445909 100644
--- a/components/cloud-foundry/frontend/i18n/en_US/errors.json
+++ b/components/cloud-foundry/frontend/i18n/en_US/errors.json
@@ -1,7 +1,7 @@
 {
   "errors": {
     "no-cf-connected": "No connected [[@:cloud-foundry]] endpoints.",
-    "no-cf-connected-text": "<a class=\"btn-link\" href=\"/#/endpoint\">Use the Endpoints Dashboard</a> to fix your connections or connect to new endpoints.",
+    "no-cf-connected-text": "<a class=\"btn-link\" href=\"/#!/endpoint\">Use the Endpoints Dashboard</a> to fix your connections or connect to new endpoints.",
     "no-cf-connected-cant-fix-text": "Please contact your administrator."
   }
 }
diff --git a/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js b/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js
index 7b7843bf9b..665f16cf2d 100644
--- a/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js
+++ b/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js
@@ -35,7 +35,7 @@
   };
 
   function goToApp(clusterGuid, appGuid) {
-    var url = helpers.getHost() + '/#/cf/applications/' + clusterGuid + '/app/' + appGuid + '/summary';
+    var url = helpers.getHost() + '/#!/cf/applications/' + clusterGuid + '/app/' + appGuid + '/summary';
     return browser.get(url)
       .then(function () {
         return browser.getCurrentUrl();