diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 086d04ac64..adf2120d95 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1041,7 +1041,7 @@
],
"tests":[
"assert(test === 2, 'Your RegEx should have found two numbers in the testString');",
- "assert(editor.getValue().match(/\\/\\\\d\\+\\//gi), 'You should be using the following expression /\\d+/gi to find the numbers in the testString');"
+ "assert(editor.getValue().match(/\\/\\\\d\\+\\//gi), 'You should be using the following expression /\\\\d+/gi to find the numbers in the testString');"
],
"challengeSeed":[
"var test = (function() {",
@@ -1071,7 +1071,7 @@
],
"tests":[
"assert(test === 7, 'Your RegEx should have found seven spaces in the testString
.');",
- "assert(editor.getValue().match(/\\/\\\\s\\+\\//gi), 'You should be using the following expression /\\s+/gi to find the spaces in the testString
.');"
+ "assert(editor.getValue().match(/\\/\\\\s\\+\\//gi), 'You should be using the following expression /\\\\s+/gi to find the spaces in the testString
.');"
],
"challengeSeed":[
"var test = (function(){",
@@ -1099,7 +1099,7 @@
],
"tests":[
"assert(test === 49, 'Your RegEx should have found forty nine non-space characters in the testString
.');",
- "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\S/gi
to find non-space characters in the testString
.');"
+ "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\\\S/gi
to find non-space characters in the testString
.');"
],
"challengeSeed":[
"var test = (function(){",
diff --git a/server/boot/a-extendUserIdent.js b/server/boot/a-extendUserIdent.js
index 7114e1b53f..d14874d08b 100644
--- a/server/boot/a-extendUserIdent.js
+++ b/server/boot/a-extendUserIdent.js
@@ -49,7 +49,7 @@ export default function({ models }) {
}
if (identity.userId.toString() !== userId.toString()) {
return Observable.throw(
- new Error('An account is already linked to that profile')
+ new Error("It looks like you already have an account associated with that sign in method. Here's what you can do: 1) Sign out of this account. 2) Use that sign in method to sign into your other account. 3) Delete that account. 4) Then sign back into this account and you'll be able to link it here. If you need help, send us an email at team@freecodecamp.com.")
);
}
identity.credentials = credentials;