changes for 1.5 user models