set email from user and solved little bugs