diff --git a/Gemfile b/Gemfile
index c822e9d..95ff679 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ group :development do
   gem 'guard-rspec'
   gem 'rake'
   gem 'bundler'
+  gem 'sinatra'
 end
 
 group :test do
diff --git a/lib/omniauth/strategies/remote_user.rb b/lib/omniauth/strategies/remote_user.rb
index 463bfea..6984d2e 100644
--- a/lib/omniauth/strategies/remote_user.rb
+++ b/lib/omniauth/strategies/remote_user.rb
@@ -73,7 +73,8 @@ module OmniAuth
         user_data = request.env['HTTP_REMOTE_USER_DATA']
         if user_data
           data = JSON.parse(user_data)
-          data['nickname'] = data['firstname'] = data['name'].split()[0]
+          data['nickname'] = uid
+          data['firstname'] = data['name'].split()[0]
           data['lastname'] = data['name'].split()[1]
           data
         else
--
libgit2 0.21.2