diff --git a/lib/github_changelog_generator/generator/generator_generation.rb b/lib/github_changelog_generator/generator/generator_generation.rb
index 81c7c22..44df8df 100644
--- a/lib/github_changelog_generator/generator/generator_generation.rb
+++ b/lib/github_changelog_generator/generator/generator_generation.rb
@@ -179,7 +179,7 @@ module GitHubChangelogGenerator
       user = issue.user
       return "#{line} ({Null user})" unless user
 
-      if user.html_url.include?("github.com")
+      if @options[:usernames_as_github_logins]
         "#{line} (@#{user.login})"
       else
         "#{line} ([#{user.login}](#{user.html_url}))"