Finish sign in, up to 8.4