updating to fix bad if/else in User