Updated to try to work with the userStore, so far not so good

Signed-off-by: Gabriel Reiser <gabriel.reiser@mybrighthouse.com>