User functionality fixes