Revert "Fix NPE on login."

This reverts commit 6eeac845d82cc85ba15b513d9f10f632623bcdf2.