Added logic for 'forgot password' situation