diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 57c00ae..22124e9 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -6,16 +6,14 @@
 # no regular words or you'll be exposed to dictionary attacks.
 
 # Everyone can share the same token for development/test
-if %w(development test).include? Rails.env
-  Errbit::Application.config.secret_token = 'f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c'
-else
-
-  if ENV['SECRET_TOKEN'].present?
-    Errbit::Application.config.secret_token = ENV['SECRET_TOKEN']
+if ENV['SECRET_TOKEN'].present?
+  Errbit::Application.config.secret_token = ENV['SECRET_TOKEN']
 
   # Do not raise an error if secret token is not available during assets precompilation
-  elsif ENV['RAILS_GROUPS'] != 'assets' && !Errbit::Application.config.secret_token
-    raise <<-ERROR
+elsif %w(development test).include?(Rails.env) || ENV['RAILS_GROUPS'] == 'assets'
+  Errbit::Application.config.secret_token = 'f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c'
+elsif !Errbit::Application.config.secret_token
+  raise <<-ERROR
 
   You must generate a unique secret token for your Errbit instance.
 
@@ -32,7 +30,6 @@ else
       echo "Errbit::Application.config.secret_token = '$(bundle exec rake secret)'" > config/initializers/__secret_token.rb
 
   ERROR
-  end
 end
 
 Devise.secret_key = Errbit::Application.config.secret_token
--
libgit2 0.21.2