Task #9385 - App to remember entered email addresses
Adding all latest changes
Fixing merge issue