Fixed existing user implementation.