From 40a500648c4ef3ed9cbda515fe74bb585b5b3387 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Fri, 31 Aug 2018 10:23:22 +0100
Subject: [PATCH] Move the new logic to the `externalAuthenticationSystemUsed`
 function

---
 services/web/app/coffee/infrastructure/Features.coffee | 2 +-
 services/web/app/views/user/settings.pug               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee
index 37f62ddec2..c5531099d8 100644
--- a/services/web/app/coffee/infrastructure/Features.coffee
+++ b/services/web/app/coffee/infrastructure/Features.coffee
@@ -2,7 +2,7 @@ Settings = require 'settings-sharelatex'
 
 module.exports = Features =
 	externalAuthenticationSystemUsed: ->
-		Settings.ldap? or Settings.saml? or Settings.overleaf?.oauth?
+		Settings.ldap? or Settings.saml? or (Settings.overleaf?.oauth? && !Settings.createV1AccountOnLogin)
 
 	hasFeature: (feature) ->
 		switch feature
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index eb2b535efb..bb66b83a44 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -148,7 +148,7 @@ block content
 
 							hr
 
-							if !externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf)
+							if !externalAuthenticationSystemUsed()
 
 								p.small
 									| #{translate("newsletter_info_and_unsubscribe")}