added password reset and moved join