diff --git a/README.md b/README.md
index 130e95574f..a025d9a6bd 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,18 @@ MIFOS_WAIT_TIME_FOR_CATCHUP=30
 ```
 
 
+Setting for display or hide the Tenant selector in the Login view (mainly for Production environments and for security reasons), Default true
+```
+MIFOS_DISPLAY_TENANT_SELECTOR=false
+```
+
+
+Setting for display or hide the Backend info (url) in the footer part (mainly for security reasons), Default true
+```
+MIFOS_DISPLAY_BACKEND_INFO=false
+```
+
+
 For more information look the env.sample file in the root directory of the project
 
 ## Want to help? [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/openMF/web-app/issues)
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index f275eeea4b..763b5d67b2 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -46,7 +46,7 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate}}</h1>
     </div>
 
     <!-- Tenant Identifier Name -->
-    <div fxLayout="row" fxLayoutAlign="center center" fxFlex="1 0 auto" *ngIf="!environment.production">
+    <div fxLayout="row" fxLayoutAlign="center center" fxFlex="1 0 auto" *ngIf="displayTenantSelector()">
       <mifosx-tenant-selector></mifosx-tenant-selector>
     </div>
 
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index e91238eb90..978599318f 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -77,4 +77,8 @@ export class LoginComponent implements OnInit, OnDestroy {
     window.location.reload();
   }
 
+  displayTenantSelector(): boolean {
+    return environment.displayTenantSelector === 'false' ? false : true;
+  }
+
 }
diff --git a/src/assets/env.js b/src/assets/env.js
index ca18313baf..0c7ce59844 100644
--- a/src/assets/env.js
+++ b/src/assets/env.js
@@ -23,6 +23,9 @@
   // Display or not the BackEnd Info
   window['env']['displayBackEndInfo'] = '';
 
+  // Display or not the Tenant Selector
+  window['env']['displayTenantSelector'] = '';
+
   // Time in seconds for Notifications, default 60 seconds
   window['env']['waitTimeForNotifications'] = '';
 
diff --git a/src/assets/env.template.js b/src/assets/env.template.js
index c028ef4e51..74cbd05a68 100644
--- a/src/assets/env.template.js
+++ b/src/assets/env.template.js
@@ -23,6 +23,9 @@
   // Display or not the BackEnd Info
   window['env']['displayBackEndInfo'] = '$MIFOS_DISPLAY_BACKEND_INFO';
 
+  // Display or not the Tenant Selector
+  window['env']['displayTenantSelector'] = '$MIFOS_DISPLAY_TENANT_SELECTOR';
+
   // Time in seconds for Notifications, default 60 seconds
   window['env']['waitTimeForNotifications'] = '$MIFOS_WAIT_TIME_FOR_NOTIFICATIONS';
 
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 9a861d30ce..1dbcca88d9 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -33,6 +33,7 @@ export const environment = {
   defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ',',
 
   displayBackEndInfo: window['env']['displayBackEndInfo'] || 'true',
+  displayTenantSelector: window['env']['displayTenantSelector'] || 'true',
   // Time in seconds, default 60 seconds
   waitTimeForNotifications: window['env']['waitTimeForNotifications'] || 60,
   // Time in seconds, default 30 seconds
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 62beeb7384..529209d1eb 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -39,6 +39,7 @@ export const environment = {
   defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ',',
 
   displayBackEndInfo: window['env']['displayBackEndInfo'] || 'true',
+  displayTenantSelector: window['env']['displayTenantSelector'] || 'true',
   // Time in seconds, default 60 seconds
   waitTimeForNotifications: window['env']['waitTimeForNotifications'] || 60,
   // Time in seconds, default 30 seconds