Login behaving a little better, more cleanup.