diff --git a/NEWS.md b/NEWS.md
index 00cb0d7a0c..714fecd0fa 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2931,7 +2931,7 @@ Now, back to the new features!
   * Full screen options are enabled by default for public visualizations
   * Empty the_geom from CSV no longer imports to "" instead of NULL
   * Trying to change a password no longer returns unauthorized
-  * User destroy no longer fails when he has named maps
+  * User destroy no longer fails when she/he has named maps
   * /api/v1/tables returns 404 when table does not exist
 
 
diff --git a/app/assets/stylesheets/common/dropdown-link.css.scss b/app/assets/stylesheets/common/dropdown-link.css.scss
index 78ae385243..fc02290bad 100644
--- a/app/assets/stylesheets/common/dropdown-link.css.scss
+++ b/app/assets/stylesheets/common/dropdown-link.css.scss
@@ -2,7 +2,7 @@
 @import "../variables/colors";
 @import "../variables/sizes";
 
-// Append a standard dropdown triangle icon next to he right of the text of the link, like "foobar v".
+// Append a standard dropdown triangle icon next to the right of the text of the link, like "foobar v".
 // Usage is as simple as:
 //   <a href="#" class="DropdownLink">My text</a>
 //
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 3776102632..da7bb91142 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -119,8 +119,8 @@ class UserMailer < ActionMailer::Base
 
   private
 
-  # If user has been created by the admin he needs to tell him the password.
-  # If he has signed in through the page he doesn't.
+  # If user has been created by the admin they need to tell them the password.
+  # If user has signed in through the page they doesn't.
   def user_needs_password(user)
     !user.google_sign_in && user.enable_account_token.nil? && !user.created_with_invitation?
   end
diff --git a/assets/stylesheets/common/dropdown-link.scss b/assets/stylesheets/common/dropdown-link.scss
index 78ae385243..fc02290bad 100644
--- a/assets/stylesheets/common/dropdown-link.scss
+++ b/assets/stylesheets/common/dropdown-link.scss
@@ -2,7 +2,7 @@
 @import "../variables/colors";
 @import "../variables/sizes";
 
-// Append a standard dropdown triangle icon next to he right of the text of the link, like "foobar v".
+// Append a standard dropdown triangle icon next to the right of the text of the link, like "foobar v".
 // Usage is as simple as:
 //   <a href="#" class="DropdownLink">My text</a>
 //
diff --git a/doc/manual/source/operations/http_headers_authentication.rst b/doc/manual/source/operations/http_headers_authentication.rst
index 226f64768d..ede22c85c1 100644
--- a/doc/manual/source/operations/http_headers_authentication.rst
+++ b/doc/manual/source/operations/http_headers_authentication.rst
@@ -30,5 +30,5 @@ Even more, if you want not only *authentication* (authenticating existing users)
 
 * ``email``: value of the header (``alice@myorg.com``).
 * ``username``: user of the email ( ``alice``).
-* ``password``: random. He can change it in his account page.
+* ``password``: random. they can change it in their account page.
 * ``organization``: taken from the subdomain (``myorg``).
diff --git a/lib/tasks/tables.rake b/lib/tasks/tables.rake
index da3ac5b377..bbb0ac92dc 100644
--- a/lib/tasks/tables.rake
+++ b/lib/tasks/tables.rake
@@ -57,7 +57,7 @@ namespace :cartodb do
         end
       end
 
-      # Then, remove permissions of everything he has access to
+      # Then, remove permissions of everything they have access to
       CartoDB::SharedEntity.where(recipient_id: user.id).each do |shared_entity|
         permissions = CartoDB::Permission.where(entity_id: shared_entity.entity_id)
         permissions.each do |permission|
diff --git a/spec/models/user_shared_examples.rb b/spec/models/user_shared_examples.rb
index b55cf0d105..d01bff083f 100644
--- a/spec/models/user_shared_examples.rb
+++ b/spec/models/user_shared_examples.rb
@@ -34,7 +34,7 @@ shared_examples_for "user models" do
     end
 
     it 'is enabled if organization has it enabled and with custom config, no matter whether user has it or not,
-        and enabled if he has it enabled and with custom config, no matter whether org has it or not' do
+        and enabled if he/she has it enabled and with custom config, no matter whether org has it or not' do
       twitter_search_conf = @config[:datasource_search]['twitter_search']
       custom_wadus = {
         "auth_required" => false,
diff --git a/spec/requests/admin/organization_users_controller_spec.rb b/spec/requests/admin/organization_users_controller_spec.rb
index 02b7ea1ab1..835eb586e8 100644
--- a/spec/requests/admin/organization_users_controller_spec.rb
+++ b/spec/requests/admin/organization_users_controller_spec.rb
@@ -615,7 +615,7 @@ describe Admin::OrganizationUsersController do
           @user.destroy if @user
         end
 
-        it 'owner cannot enable soft limits if he has not' do
+        it 'owner cannot enable soft limits if she/he has not' do
           old_limits = update_soft_limits(@org_user_owner, false)
 
           post create_organization_user_url(user_domain: @org_user_owner.username),
@@ -628,7 +628,7 @@ describe Admin::OrganizationUsersController do
           update_soft_limits(@org_user_owner, old_limits)
         end
 
-        it 'owner cannot enable geocoding limit if he has not' do
+        it 'owner cannot enable geocoding limit if she/he has not' do
           old_limits = update_soft_limits(@org_user_owner, false)
 
           post create_organization_user_url(user_domain: @org_user_owner.username),
@@ -656,7 +656,7 @@ describe Admin::OrganizationUsersController do
           update_soft_limits(@org_user_owner, old_limits)
         end
 
-        it 'owner can enable soft limits if he has' do
+        it 'owner can enable soft limits if she/he has' do
           old_limits = update_soft_limits(@org_user_owner, true)
 
           post create_organization_user_url(user_domain: @org_user_owner.username),
@@ -676,7 +676,7 @@ describe Admin::OrganizationUsersController do
           ::User[@existing_user.id].destroy if @existing_user
         end
 
-        it 'owner cannot enable soft limits if he has not' do
+        it 'owner cannot enable soft limits if she/he has not' do
           old_limits = update_soft_limits(@org_user_owner, false)
           check_soft_limits(@carto_org_user_owner, false)
           @existing_user = FactoryGirl.create(:carto_user,
@@ -692,7 +692,7 @@ describe Admin::OrganizationUsersController do
           update_soft_limits(@org_user_owner, old_limits)
         end
 
-        it 'owner can enable soft limits if he has' do
+        it 'owner can enable soft limits if she/he has' do
           old_limits = update_soft_limits(@org_user_owner, true)
           @existing_user = FactoryGirl.create(:carto_user,
                                               soft_limits_params(false).merge(organization: @carto_organization))
@@ -707,7 +707,7 @@ describe Admin::OrganizationUsersController do
           update_soft_limits(@org_user_owner, old_limits)
         end
 
-        it 'owner can disable soft limits if he has' do
+        it 'owner can disable soft limits if she/he has' do
           old_limits = update_soft_limits(@org_user_owner, true)
           @existing_user = FactoryGirl.create(:carto_user,
                                               soft_limits_params(true).merge(organization: @carto_organization))