another quick fix
updated now using userid for lookup instead of client id
another quick fix
clean compile