diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js
index b10dd10..6c439a5 100644
--- a/src/components/LoginPage.js
+++ b/src/components/LoginPage.js
@@ -82,7 +82,7 @@ const LoginPage = ({ theme }) => {
   const setLocale = useSetLocale();
   const translate = useTranslate();
   const base_url = localStorage.getItem("base_url");
-  const override_server = process.env.REACT_APP_SERVER;
+  const cfg_base_url = process.env.REACT_APP_SERVER;
 
   const renderInput = ({
     meta: { touched, error } = {},
@@ -150,7 +150,7 @@ const LoginPage = ({ theme }) => {
     const [serverVersion, setServerVersion] = useState("");
 
     const handleUsernameChange = _ => {
-      if (formData.base_url || override_server) return;
+      if (formData.base_url || cfg_base_url) return;
       // check if username is a full qualified userId then set base_url accordially
       const home_server = extractHomeServer(formData.username);
       const wellKnownUrl = `https://${home_server}/.well-known/matrix/client`;
@@ -222,7 +222,7 @@ const LoginPage = ({ theme }) => {
             name="base_url"
             component={renderInput}
             label={translate("synapseadmin.auth.base_url")}
-            disabled={override_server ? true : loading}
+            disabled={cfg_base_url || loading}
             resettable
             fullWidth
           />
@@ -234,7 +234,7 @@ const LoginPage = ({ theme }) => {
 
   return (
     <Form
-      initialValues={{ base_url: override_server ? override_server : base_url }}
+      initialValues={{ base_url: cfg_base_url || base_url }}
       onSubmit={handleSubmit}
       validate={validate}
       render={({ handleSubmit }) => (
diff --git a/src/synapse/authProvider.js b/src/synapse/authProvider.js
index b923229..470637f 100644
--- a/src/synapse/authProvider.js
+++ b/src/synapse/authProvider.js
@@ -4,9 +4,7 @@ const authProvider = {
   // called when the user attempts to log in
   login: ({ base_url, username, password }) => {
     // force homeserver for protection in case the form is manipulated
-    base_url = process.env.REACT_APP_SERVER
-      ? process.env.REACT_APP_SERVER
-      : base_url;
+    base_url = process.env.REACT_APP_SERVER || base_url;
 
     console.log("login ");
     const options = {