Continued work on fixing profile join, reset password, etc