Fix NPE on Login

Going after the top crash report for the day.  Don't have a repro, so need testing.