Fixed bugs with user/currentuser