2 files changed, 5 insertions, 9 deletions

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 88c742a54..b36e71ce1 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -117,11 +117,7 @@ export default @observer class Signup extends Component {
     const { intl } = this.context;
     const { isSubmitting, loginRoute, error } = this.props;
 
-    //Old code before my commit
-    //const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
-
-    //This is the change for the issue #80, need testing
-        const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com';
+    const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
 
     return (
       <div className="auth__scroll-container">
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 65e0326da..6afb63c83 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -463,11 +463,11 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal('https://meetfranz.com/terms'); },
+        click() { shell.openExternal('${termsBase}/terms'); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+        click() { shell.openExternal('${termsBase}/privacy'); },
       },
     ],
   },