Changed username to use Settings