Add middle names to user account plugin + cleanup