Fix logging to include user name