Changed userid back to username to fix comments