Fixed password/email swap bug