diff --git a/lib/casserver/server.rb b/lib/casserver/server.rb
index 781ba40c..567bb8d9 100644
--- a/lib/casserver/server.rb
+++ b/lib/casserver/server.rb
@@ -531,7 +531,7 @@ def self.init_database!
 
       # BZ modification: always use default service so logout/login goes back to our main
       # site (which can redirect) regardless of where they came from
-      @service = clean_service_url(settings.config[:default_service]) # params['service'] || params['destination'])
+      @service = clean_service_url(params['service'] || settings.config[:default_service]) # params['service'] || params['destination'])
       @continue_url = params['url']
 
       @gateway = params['gateway'] == 'true' || params['gateway'] == '1'