Fixed user issues in Users module