bug fixes to registration and forgot password email processes
merge with remote master