diff --git a/lib/travis/github/services/find_or_create_user.rb b/lib/travis/github/services/find_or_create_user.rb
index <HASH>..<HASH> 100644
--- a/lib/travis/github/services/find_or_create_user.rb
+++ b/lib/travis/github/services/find_or_create_user.rb
@@ -32,7 +32,15 @@ module Travis
           end
 
           def data
-            @data ||= GH["users/#{params[:login]}"] || raise(Travis::GithubApiError)
+            unless defined?(@data)
+              if params[:github_id]
+                @data ||= GH["user/#{params[:github_id]}"] || raise(Travis::GithubApiError)
+              else
+                @data ||= GH["users/#{params[:login]}"] || raise(Travis::GithubApiError)
+              end
+            end
+
+            @data
           end
       end
     end
Fetch user from GitHub by ID when creating