Simplify code for first log on.

cc @BooDoo