diff --git a/services/web/app/coffee/Features/User/UserRegistrationHandler.coffee b/services/web/app/coffee/Features/User/UserRegistrationHandler.coffee
index 1291142dab..0928f64640 100644
--- a/services/web/app/coffee/Features/User/UserRegistrationHandler.coffee
+++ b/services/web/app/coffee/Features/User/UserRegistrationHandler.coffee
@@ -20,10 +20,13 @@ module.exports = UserRegistrationHandler =
 				hasZeroLength = true
 		return hasZeroLength
 
+	isTooShort: (prop, length) ->
+		return prop.length < length
+
 	_registrationRequestIsValid : (body, callback)->
 		email = EmailHelper.parseEmail(body.email) or ''
 		password = body.password
-		if @hasZeroLengths([password, email])
+		if @hasZeroLengths([password, email]) or @isTooShort(password, 6)
 			return false
 		else
 			return true