User-related fixes

Signed-off-by: Alex Lourie <djay.il@gmail.com>