Switch from using username to uid