From ed906f085c8567c2dbaf61c57f6895e7a27ed979 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Mon, 3 Oct 2016 11:33:14 +0100
Subject: [PATCH] fix spelling mistake in error message and comment out
 settings.defaults

---
 services/web/config/settings.defaults.coffee           | 10 +++++-----
 services/web/public/coffee/directives/asyncForm.coffee |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index cd8421336b..96625fa861 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -190,11 +190,11 @@ module.exports = settings =
 	# -----------
 	# These restrict the passwords users can use when registering
 	# opts are from http://antelle.github.io/passfield
-	passwordStrengthOptions:
-		# pattern: "aA$3"
-		length:
-			min: 1
-			max: 10
+	# passwordStrengthOptions:
+	# 	pattern: "aA$3"
+	# 	length:
+	# 		min: 1
+	# 		max: 10
 
 	# Email support
 	# -------------
diff --git a/services/web/public/coffee/directives/asyncForm.coffee b/services/web/public/coffee/directives/asyncForm.coffee
index b24f4952f3..8bcf610640 100644
--- a/services/web/public/coffee/directives/asyncForm.coffee
+++ b/services/web/public/coffee/directives/asyncForm.coffee
@@ -125,6 +125,6 @@ define [
 						scope.complexPasswordErrorMessage = "Password can not contain email address"
 				if opts.length.max? and modelValue.length == opts.length.max
 					isValid = false
-					scope.complexPasswordErrorMessage = "Maxium password length #{opts.length.max} reached"
+					scope.complexPasswordErrorMessage = "Maximum password length #{opts.length.max} reached"
 				ngModelCtrl.$setValidity('complexPassword', isValid)
 				return modelValue