Added user creation, fix in report generation