diff --git a/docs/3.0.0-beta.x/getting-started/install-requirements.md b/docs/3.0.0-beta.x/getting-started/install-requirements.md
index 1f93e06faf..7e86b61c83 100644
--- a/docs/3.0.0-beta.x/getting-started/install-requirements.md
+++ b/docs/3.0.0-beta.x/getting-started/install-requirements.md
@@ -15,7 +15,7 @@ You can also use **yarn** if you want [here](https://yarnpkg.com/en/docs/getting
 
 Strapi is supporting multiple databases. If you are using the `--quickstart` or if you manually chose the `SQLite` database, you will not need to install any database on you local computer.
 
-If you want to use a custom database, here is versions you will have to respect:
+If you want to use a custom database, here are the versions you will have to respect:
 
 - **MongoDB** >= 3.6
 - **MySQL** >= 5.6
diff --git a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md b/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md
index b1b7f3b25a..186142d409 100644
--- a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md
+++ b/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md
@@ -496,7 +496,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
 **2. Change the `collectionName` of the component**
 
 **Before**
-`./components/component.json`
+`./components/yourcategoryname/yourcomponentname.json`
 
 ```json
 {
@@ -506,7 +506,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
 ```
 
 **After**
-`./components/component.json`
+`./components/yourcategoryname/yourcomponentname.json`
 
 ```json
 {
@@ -565,7 +565,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
 **3. Change the `collectionName` of the component**
 
 **Before**
-`./components/component.json`
+`./components/yourcategoryname/yourcomponentname.json`
 
 ```json
 {
@@ -575,7 +575,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
 ```
 
 **After**
-`./components/component.json`
+`./components/yourcategoryname/yourcomponentname.json`
 
 ```json
 {
diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js
index 1b0b4f73f2..841ea4c255 100644
--- a/packages/strapi-plugin-users-permissions/controllers/Auth.js
+++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js
@@ -112,7 +112,7 @@ module.exports = {
           formatError({
             id: 'Auth.form.error.password.local',
             message:
-              'This user never set a local password, please login thanks to the provider used during account creation.',
+              'This user never set a local password, please login with the provider used during account creation.',
           })
         );
       }
@@ -150,7 +150,7 @@ module.exports = {
         );
       }
 
-      // Connect the user thanks to the third-party provider.
+      // Connect the user with the third-party provider.
       let user, error;
       try {
         [user, error] = await strapi.plugins[
@@ -295,7 +295,7 @@ module.exports = {
       name: 'users-permissions',
     });
 
-    // Find the user user thanks to his email.
+    // Find the user by email.
     const user = await strapi
       .query('user', 'users-permissions')
       .findOne({ email });