diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 57694da4dfab76982738b6a4e5a7cca003ec2c43..557fbd0a10754c76e8083365a9deea3908a3831d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -170,6 +170,9 @@ production: &base
     ## Application settings cache expiry in seconds (default: 60)
     # application_settings_cache_seconds: 60
 
+    ## Print initial root password to stdout during initialization (default: true)
+    # display_initial_root_password: true
+
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
   # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index c00d0c04e5f36a011f29d1a8327c12e814d8e66a..a9f5c5698237331a451455b122ca1be7faaf64f6 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -216,6 +216,8 @@
 Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil?
 Settings.gitlab['max_request_duration_seconds'] ||= 57
 
+Settings.gitlab['display_initial_root_password'] = true if Settings.gitlab['display_initial_root_password'].nil?
+
 Gitlab.ee do
   Settings.gitlab['mirror_max_delay'] ||= 300
   Settings.gitlab['mirror_max_capacity'] ||= 30
diff --git a/db/fixtures/production/002_admin.rb b/db/fixtures/production/002_admin.rb
index 1c7c89f7bbd14ac052c871eaab9b7d830ded0fd2..b6a6da3a18850f4cb891170a1d6d2a4797083b09 100644
--- a/db/fixtures/production/002_admin.rb
+++ b/db/fixtures/production/002_admin.rb
@@ -23,7 +23,11 @@
   puts "login:    root".color(:green)
 
   if user_args.key?(:password)
-    puts "password: #{user_args[:password]}".color(:green)
+    if ::Settings.gitlab['display_initial_root_password']
+      puts "password: #{user_args[:password]}".color(:green)
+    else
+      puts "password: *** - You opted not to display initial root password to STDOUT."
+    end
   else
     puts "password: You'll be prompted to create one on your first visit.".color(:green)
   end