Registration & Password Reset Modified