more fixes for customer user model compatiblity