Merge pull request #1084 from dooglus/validate_secret