IPhone 5s :: Does A Backup Restore Old Passwords

I'm having some problems with my iPhone. I changed the password on it a while back and completely cannot remember what it is. I have iPhone 5S and haven't really used the password to unlock the phone since (I use the Touch ID). I couldn't get into my phone so I had to restore it. I remotely deleted it using find my iPhone because I was also having windows problems recognizing my phone. With a fresh install, I set up as a new phone and restored using an iCloud backup. I'm sure that during this process it asked me to set a new Touch ID as well as a new passcode, which I set to one that I use more frequently. I've used it for a bit now, and came to wanting to add my other fingerprints - it then asked me for my iPhone password. I entered what I thought it should be 4 times and then though hang on, has it changed my iPhone password? I then locked the device and entered the password it should have been set to a 5th time. That then activated the 'iPhone deactivated' screen, which has now disabled my Touch ID! I'm now locked out AGAIN, I'm assuming because the iCloud backup has restored a password that I can't remember, does this sound right?Â

how long erasing the phone, restoring, entering passcodes and wifi codes, restarting the whole icloud restore, and all the other bits of tinkering that you have to do, re-syncing 3000 tracks, letting photos redownload. I don't want to waste time doing this a third time...can you confirm/clarify whether it does pull over the previous passcode?Â

Info:
iPhone 5s, iOS 7.1.1