diff --git a/CHANGELOG b/CHANGELOG
index f72bb670ece8b065e5066b5eb95edb0d8873c86f..1b3fd97a1cfeefddac7454d4ddd6977df3d7d32e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.7.0 (unreleased)
   - Expose label description in API (Mariusz Jachimowicz)
   - Allow back dating on issues when created through the API
   - Fix avatar stretching by providing a cropping feature
+  - Allow SAML to handle external users based on user's information !3530
   - Add endpoints to archive or unarchive a project !3372
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)
diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index 6ab165cf518cbd717912d73597930418da00cc0b..73fc443a02b0818203f3279d35722b2123ae46af 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -33,7 +33,6 @@ module Gitlab
             # Avoid an unnecessary change of values and the subsequent save
             @user.external = false if @user.external
           else
-            # Avoid an unnecessary change of values and the subsequent save
             @user.external = true unless @user.external
           end
         end