diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 77b818ba..08e3427f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -34,6 +34,7 @@ git_host:
   admin_uri: git@localhost:gitolite-admin
   base_path: /home/git/repositories/
   hooks_path: /home/git/.gitolite/hooks/
+  gitolite_admin_key: gitlab 
   git_user: git
   upload_pack: true
   receive_pack: true
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 27c5bc22..df9ccf32 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -102,6 +102,10 @@ class Settings < Settingslogic
       git_host['admin_uri'] || 'git@localhost:gitolite-admin'
     end
 
+    def gitolite_admin_key
+      git_host['gitolite_admin_key'] || 'gitlab'
+    end
+
     def default_projects_limit
       app['default_projects_limit'] || 10
     end
diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb
index 61ec8c11..60eef8e8 100644
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@@ -148,18 +148,7 @@ module Gitlab
     # Enable access to all repos for gitolite admin.
     # We use it for accept merge request feature
     def admin_all_repo
-      owner_name = ""
-
-      # Read gitolite-admin user
-      #
-      begin
-        repo = conf.get_repo("gitolite-admin")
-        owner_name = repo.permissions[0]["RW+"][""][0]
-        raise StandardError if owner_name.blank?
-      rescue => ex
-        puts "Can't determine gitolite-admin owner".red
-        raise StandardError
-      end
+      owner_name = Gitlab.settings.gitolite_admin_key
 
       # @ALL repos premission for gitolite owner
       repo_name = "@all"