password reset, user edit for org fix.
Merge pull request #133 from indykish/0.5

password reset, user edit for org fix.