fixes for Users snippets