Fix for User Model w/ latest update