diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionHandler.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionHandler.coffee
index 4ff938240c..3d9d473f3e 100644
--- a/services/web/app/coffee/Features/Subscription/SubscriptionHandler.coffee
+++ b/services/web/app/coffee/Features/Subscription/SubscriptionHandler.coffee
@@ -14,7 +14,6 @@ module.exports =
 		self = @
 		clientTokenId = ""
 		RecurlyWrapper.createSubscription user, subscriptionDetails, recurly_token_id, (error, recurlySubscription)->
-			console.log recurlySubscription
 			return callback(error) if error?
 			SubscriptionUpdater.syncSubscription recurlySubscription, user._id, (error) ->
 				return callback(error) if error?
diff --git a/services/web/app/coffee/Features/Wiki/WikiController.coffee b/services/web/app/coffee/Features/Wiki/WikiController.coffee
index 6d1a3a1052..9016a4dd41 100644
--- a/services/web/app/coffee/Features/Wiki/WikiController.coffee
+++ b/services/web/app/coffee/Features/Wiki/WikiController.coffee
@@ -3,37 +3,47 @@ settings = require("settings-sharelatex")
 logger = require("logger-sharelatex")
 ErrorController = require "../Errors/ErrorController"
 _ = require("underscore")
+AuthenticationController = require("../Authentication/AuthenticationController")
 
 other_lngs = ["es"]
 
 module.exports = WikiController = 
-	getPage: (req, res, next) ->
-		
-		page = req.url.replace(/^\/learn/, "").replace(/^\//, "")
-		if page == ""
-			page = "Main_Page"
 
-		logger.log page: page, "getting page from wiki"
-		if _.include(other_lngs, req.lng)
-			lngPage = "#{page}_#{req.lng}"
+
+	_checkIfLoginIsNeeded: (req, res, next)->
+		if settings.apis.wiki.requireLogin
+			AuthenticationController.requireLogin()(req, res, next)
 		else
-			lngPage = page
+			next()
 
-		WikiController._getPageContent "Contents", (error, contents) ->
-			return next(error) if error?
-			WikiController._getPageContent lngPage, (error, pageData) ->
+	getPage: (req, res, next) ->
+		WikiController._checkIfLoginIsNeeded req, res, ->
+			
+			page = req.url.replace(/^\/learn/, "").replace(/^\//, "")
+			if page == ""
+				page = "Main_Page"
+
+			logger.log page: page, "getting page from wiki"
+			if _.include(other_lngs, req.lng)
+				lngPage = "#{page}_#{req.lng}"
+			else
+				lngPage = page
+
+			WikiController._getPageContent "Contents", (error, contents) ->
 				return next(error) if error?
-				if pageData.content?.length > 280
-					if _.include(other_lngs, req.lng)
-						pageData.title = pageData.title.slice(0, pageData.title.length - (req.lng.length+1) )
-					WikiController._renderPage(pageData, contents, res)
-				else
-					WikiController._getPageContent page, (error, pageData) ->
-						return next(error) if error?
+				WikiController._getPageContent lngPage, (error, pageData) ->
+					return next(error) if error?
+					if pageData.content?.length > 280
+						if _.include(other_lngs, req.lng)
+							pageData.title = pageData.title.slice(0, pageData.title.length - (req.lng.length+1) )
 						WikiController._renderPage(pageData, contents, res)
+					else
+						WikiController._getPageContent page, (error, pageData) ->
+							return next(error) if error?
+							WikiController._renderPage(pageData, contents, res)
 
 
-				
+					
 
 	_getPageContent: (page, callback = (error, data = { content: "", title: "" }) ->) ->
 		request {
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index 79c100bbbe..6fa13cbcf3 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -337,13 +337,13 @@ module.exports =
 
 
 	
-	# ldap:
-	# 	host: 'ldap://ldap.forumsys.com'
-	# 	dnObj: 'uid'
-	# 	dnSuffix: 'dc=example,dc=com'
-	# 	failMessage: 'LDAP User Fail'
-	# 	fieldName: 'LDAP User'
-	# 	placeholder: 'LDAP User ID'
-	# 	emailAtt: 'mail'
+	ldap:
+		host: 'ldap://ldap.forumsys.com'
+		dnObj: 'uid'
+		dnSuffix: 'dc=example,dc=com'
+		failMessage: 'LDAP User Fail'
+		fieldName: 'LDAP User'
+		placeholder: 'LDAP User ID'
+		emailAtt: 'mail'