Making changes to the login page for confirmation purposes, fixing email problem.
Merge branch 'email' into dev