Improve SecretService variable naming and fix prompt logic