completed functionality to login and signup with email
merging