Merge "Fix autologin crash by removing cleverness"