Addresses #4940, conforms, retrieve_pass with fix from #4791, adds filter to retrieve user data from custom login