Added in switching between password and username