Man, crazy, it almost happened the same thing with me !
I have a S5 and Android 6.0.1 too!
To get into the phone I used my google account, then decied to set a pin code in case there is a bug in pattern lock.
To set a lock method as I want to protect my phone, I had to enter the pin which is...