diff --git a/cookbooks/gitlab/recipes/default.rb b/cookbooks/gitlab/recipes/default.rb
index ec7b4b0..a5be042 100644
--- a/cookbooks/gitlab/recipes/default.rb
+++ b/cookbooks/gitlab/recipes/default.rb
@@ -74,8 +74,6 @@ template '/etc/nginx/conf.d/gitlab.conf' do
   notifies :reload, 'service[nginx]'
 end
 
-# TODO: Remote-User authentication
-
 service 'gitlab' do
   action :enable
   supports :restart => true
diff --git a/cookbooks/gitlab/templates/gitlab.yml.erb b/cookbooks/gitlab/templates/gitlab.yml.erb
index 8caca9b..6357ebf 100644
--- a/cookbooks/gitlab/templates/gitlab.yml.erb
+++ b/cookbooks/gitlab/templates/gitlab.yml.erb
@@ -17,14 +17,11 @@ production: &base
     plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
     ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
   omniauth:
-    # Allow login via Twitter, Google, etc. using OmniAuth providers
-    enabled: false
-    allow_single_sign_on: false
-    block_auto_created_users: true
+    enabled: true
+    allow_single_sign_on: true
+    block_auto_created_users: false
     providers:
-      # - { name: 'google_oauth2', app_id: 'YOUR APP ID',
-      #     app_secret: 'YOUR APP SECRET',
-      #     args: { access_type: 'offline', approval_prompt: '' } }
+      - { name: 'RemoteUser' }
   satellites:
     path: /var/lib/gitlab/satellites
     timeout: 30
--
libgit2 0.21.2