Cleaned up and added clientCrypt data to user