*Puts on hair shirt and self-flagellates*

Thank you oh monks for helping me see the error of my ways!

I've now found the problem and fixed it - I had forgotten to remove the newline from the passwords before checking to see if they were correct, so it was always coming up with password incorrect, and I also forgot to put in Content type where the error message for wrong password was. All fixed, and I'm happy :)