Working CSP with users

Fixed some errors