Today I again had to reset my credentials on my S6 so I could select None for security lock, as follows:
1. Settings
2. Lock screem and security
3. Other security settings
4. select "Clear credentials"
5 Go back to screen type and then choose the new security setting, i.e. None, fingerprint...