fixed user stuff and added email in datastore