Load users fixes & Code review