diff --git a/README.md b/README.md
index f5cd4c762499eae5bbdd5cf761dcd0e0b6d509b0..da97ed2fb6c99c4e4a319005674ec012c34f5e34 100755
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ Example Webapp configuraion:
       - OIDC_OP_AUTHORIZATION_ENDPOINT=""
       - OIDC_OP_TOKEN_ENDPOINT=""
       - OIDC_OP_JWKS_ENDPOINT=""
+      - DISABLE_LOCAL_AUTH=False
  
 In Rosetta, only power users can:
 
diff --git a/services/webapp/code/rosetta/core_app/views.py b/services/webapp/code/rosetta/core_app/views.py
index 3961f733a3e6b8c63fe1d0996cd3945bf20887b3..0f53b84ec062039f47e2baa0f5d30a633c3fbc9d 100644
--- a/services/webapp/code/rosetta/core_app/views.py
+++ b/services/webapp/code/rosetta/core_app/views.py
@@ -36,6 +36,11 @@ def login_view(request):
     # If authenticated user reloads the main URL
     if request.method == 'GET' and request.user.is_authenticated:
         return HttpResponseRedirect('/main/')
+    else:
+        # If local auth disabled, just render login page
+        # (will be rendered an open id connect url only)
+        if settings.DISABLE_LOCAL_AUTH:
+            return render(request, 'login.html', {'data': data})
 
     # If unauthenticated user tries to log in
     if request.method == 'POST':