some server/client refactors and got user email recording to the DB