Add compat for 1.5 with new User system