Update 2237 - User.cpp