Added compatibility for old user models