Added MailAddress to the user, also removed useless gcm_id