Is the removal of `username` here correct?