Lots of changes, primarily related to the Forgot_My_Password functions.
Removed the files that ended with ~