moved the id lock handler to the client folder, and fixed an error with clearing data