Add user seting (email_notification) & fixes