Fix edit user account and add custom activity