I HAD the same problem and completely lost. Under Settings, Password, then it asked me to confirm the lock screen password, which I did and there were 7 options like: unlock, swipe, nothing and so on. It worked, I am done with that!!!!! Really did not want to do hard reset and loose everything...