Use the entire user object not userid
Least SLOC changes to use the current "user"