Fix errors
Change back to original
Fix missing user equals current user