Fixes #9 and added password match validation